Finish merge of new libical 0.23a version

2001-04-17  JP Rosevear  <jpr@ximian.com>

	* Finish merge of new libical 0.23a version

svn path=/trunk/; revision=9420

4 files changed, 16 insertions, 13 deletions

diff --git a/libical/test-data/0 b/libical/test-data/0
index 9328d854eb..ed915ad582 100644
--- a/libical/test-data/0
+++ b/libical/test-data/0
@@ -1,5 +1,7 @@
 BEGIN:VCALENDAR
 BEGIN:VEVENT
 SUMMARY:Bastille Day Party This option indicates that xauth should attempt to break any authority file locks before proceeding.
+SUMMARY:Bastille Day Party This option indicates that xauth should 
+ attempt to break any authority file locks before proceeding.
 END:VEVENT
 END:VCALENDAR
diff --git a/libical/test-data/1 b/libical/test-data/1
index 3670e54141..a4d078d47b 100644
--- a/libical/test-data/1
+++ b/libical/test-data/1
@@ -32,8 +32,7 @@ CREATED:19980309T130000Z
 SUMMARY:XYZ Project Review
 DTSTAR;TZID=US-Eastern:19980312T083000
 DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference 
-Room 4350
+LOCATION:1CP Conference Room 4350
 END:VEVENT
 END:VCALENDAR
 
diff --git a/libical/test-data/2445.ics b/libical/test-data/2445.ics
index ce94e62e9f..ecf6f106ff 100644
--- a/libical/test-data/2445.ics
+++ b/libical/test-data/2445.ics
@@ -10,7 +10,7 @@ END:VCALENDAR
 
 BEGIN:VEVENT
 UID:19970901T130000Z-123401@host.com
-DTSTAMP:19970901T1300Z
+DTSTAMP:19970901T130000Z
 DTSTART:19970903T163000Z
 DTEND:19970903T190000Z
 SUMMARY:Annual Employee Review
@@ -20,7 +20,7 @@ END:VEVENT
 
 BEGIN:VEVENT
 UID:19970901T130000Z-123402@host.com
-DTSTAMP:19970901T1300Z
+DTSTAMP:19970901T130000Z
 DTSTART:19970401T163000Z
 DTEND:19970402T010000Z
 SUMMARY:Laurel is in sensitivity awareness class.
@@ -31,7 +31,7 @@ END:VEVENT
 
 BEGIN:VEVENT
 UID:19970901T130000Z-123403@host.com
-DTSTAMP:19970901T1300Z
+DTSTAMP:19970901T130000Z
 DTSTART:19971102
 SUMMARY:Our Blissful Anniversary
 CLASS:CONFIDENTIAL
@@ -41,7 +41,7 @@ END:VEVENT
 
 BEGIN:VTODO
 UID:19970901T130000Z-123404@host.com
-DTSTAMP:19970901T1300Z
+DTSTAMP:19970901T130000Z
 DTSTART:19970415T133000Z
 DUE:19970416T045959Z
 SUMMARY:1996 Income Tax Preparation
@@ -53,7 +53,7 @@ END:VTODO
 
 BEGIN:VJOURNAL
 UID:19970901T130000Z-123405@host.com
-DTSTAMP:19970901T1300Z
+DTSTAMP:19970901T130000Z
 DTSTART;VALUE=DATE:19970317
 SUMMARY:Staff meeting minutes
 DESCRIPTION:1. Staff meeting: Participants include Joe\, Lisa
@@ -253,7 +253,7 @@ METHOD:PUBLISH
 VERSION:2.0
 PRODID:-//ABC Corporation//NONSGML My Product//EN
 BEGIN:VEVENT
-DTSTAMP:19970324T1200Z
+DTSTAMP:19970324T120000Z
 SEQUENCE:0
 UID:uid3@host1.com
 ORGANIZER:MAILTO:jdoe@host1.com
@@ -284,7 +284,7 @@ STATUS:NEEDS-ACTION
 SUMMARY:Submit Income Taxes
 BEGIN:VALARM
 ACTION:AUDIO
-TRIGGER:19980403T120000
+TRIGGER:P1DT25M
 ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
  files/ssbanner.aud
 REPEAT:4
diff --git a/libical/test-data/2446.ics b/libical/test-data/2446.ics
index 032276c3a8..c6e2359aa1 100644
--- a/libical/test-data/2446.ics
+++ b/libical/test-data/2446.ics
@@ -106,6 +106,7 @@ RRULE:FREQ=YEARLY;INTERVAL=1
 SUMMARY: Bastille Day
 END:VEVENT
 END:VCALENDAR
+
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:REQUEST
@@ -120,13 +121,14 @@ ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
 ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
 DTSTAMP:19970611T190000Z
 DTSTART:19970701T200000Z
-DTEND:19970701T2000000Z
+DTEND:19970701T200000Z
 SUMMARY:Conference
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:0
 STATUS:CONFIRMED
 END:VEVENT
 END:VCALENDAR
+
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:REPLY
@@ -826,7 +828,7 @@ SUMMARY:Create the requirements document
 UID:calsrv.example.com-873970198738777-00@example.com
 SEQUENCE:0
 DTSTAMP:19970717T200000Z
-STATUS:Needs Action
+STATUS:NEEDS-ACTION
 END:VTODO
 END:VCALENDAR
 BEGIN:VCALENDAR
@@ -904,7 +906,7 @@ SUMMARY:Create the requirements document
 UID:calsrv.example.com-873970198738777-00@example.com
 SEQUENCE:1
 DTSTAMP:19970718T100000Z
-STATUS:IN-PROGRESS
+STATUS:IN-PROCESS
 PERCENT-COMPLETE:40
 END:VTODO
 END:VCALENDAR
@@ -978,7 +980,7 @@ BEGIN:VEVENT
 UID:acme-12345@host1.com
 SEQUENCE:3
 RRULE:FREQ=WEEKLY
-RDATE;VALUE=PERIOD:19970819T210000Z/199700819T220000Z
+RDATE;VALUE=PERIOD:19970819T210000Z/19970819T220000Z
 ORGANIZER:Mailto:A@example.com
 ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
 ATTENDEE:Mailto:B@example.com