4 files changed, 23 insertions, 44 deletions
diff --git a/libical/src/libical/Makefile b/libical/src/libical/Makefile
index 90b59fbc91..8dc078db2c 100644
--- a/libical/src/libical/Makefile
+++ b/libical/src/libical/Makefile
@@ -4,7 +4,7 @@ SCRIPTS = ../../scripts
 SOURCES = icalcomponent.c icalproperty.c icalparameter.c icalenums.c icalvalue.c icalerror.c icalmemory.c icaltypes.c icalparser.c icalrestriction.c pvl.c
 OBJECTS =  ${SOURCES:.c=.o}
 INCLUDES = -I . -I..
-CFLAGS =  -Wall -g  $(INCLUDES)  -DSTDC_HEADERS=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_TIME_H=1 -DHAVE_STDIO_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_ASSERT_H=1 -DHAVE_STRDUP=1  -DICAL_ERRORS_ARE_FATAL 
+CFLAGS =  -Wall -g -O2  $(INCLUDES)  -DSTDC_HEADERS=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_TIME_H=1 -DHAVE_STDIO_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_ASSERT_H=1 -DHAVE_STRDUP=1  -DICAL_ERRORS_ARE_FATAL 
 LIBS   = 
 CC     = gcc
 AR     = ar cr
diff --git a/libical/src/libicalss/Makefile b/libical/src/libicalss/Makefile
index 91691b9051..3fb5387911 100644
--- a/libical/src/libicalss/Makefile
+++ b/libical/src/libicalss/Makefile
@@ -2,7 +2,7 @@
 SOURCES = icalcluster.c icalstore.c icalcalendar.c
 OBJECTS =  ${SOURCES:.c=.o}
 INCLUDES = -I . -I.. -I../libical
-CFLAGS =  -Wall -g  $(INCLUDES)  -DSTDC_HEADERS=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_TIME_H=1 -DHAVE_STDIO_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_ASSERT_H=1 -DHAVE_STRDUP=1  -DICAL_ERRORS_ARE_FATAL 
+CFLAGS =  -Wall -g -O2  $(INCLUDES)  -DSTDC_HEADERS=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_TIME_H=1 -DHAVE_STDIO_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_ASSERT_H=1 -DHAVE_STRDUP=1  -DICAL_ERRORS_ARE_FATAL 
 LIBS   = 
 CC     = gcc
 AR     = ar cr
diff --git a/libical/test-data/0 b/libical/test-data/0
index e30493fcc0..3d7fb999cb 100644
--- a/libical/test-data/0
+++ b/libical/test-data/0
@@ -1,21 +1,9 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-VERSION:0.0.1
-BEGIN:VEVENT
-UID:20000216T083142-31506-500-2714-0@twitch
-SEQUENCE:0
-DTSTART:19970714T170000
-DTEND:19970715T035959
-DCREATED:19691231T160000
-LAST-MODIFIED:20000216T083142
-SUMMARY:Bastille Day Party
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-X-PILOTID:0
-X-PILOTSTAT:1
-END:VEVENT
-
-END:VCALENDAR
-
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//hacksw/handcal//NONSGML v1.0//EN
+BEGIN:VEVENT
+DTSTART:19970714T170000Z
+DTEND:19970715T035959Z
+SUMMARY:Bastille Day Party
+END:VEVENT
+END:VCALENDAR
diff --git a/libical/test-data/6 b/libical/test-data/6
index e0214b5021..753bd2b66c 100644
--- a/libical/test-data/6
+++ b/libical/test-data/6
@@ -1,21 +1,12 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-VERSION:0.0.1
-BEGIN:VEVENT
-UID:0981234-1234234-23@example.com
-SEQUENCE:0
-DTSTART:19970701T200000
-DTEND:19691231T160000
-DCREATED:19691231T160000
-LAST-MODIFIED:20000216T083225
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-X-PILOTID:0
-X-PILOTSTAT:1
-END:VEVENT
-
-END:VCALENDAR
-
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+PRODID:-//ACME/DesktopCalendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+ORGANIZER:mailto:a@example.com
+DTSTART:19970701T200000Z
+DTSTAMP:19970611T190000Z
+SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
+UID:0981234-1234234-23@example.com
+END:VEVENT
+END:VCALENDAR