merge libical-0.17 onto the head

svn path=/trunk/; revision=3449

1 files changed, 18 insertions, 27 deletions

diff --git a/libical/test-data/2446.ics b/libical/test-data/2446.ics
index 679f6c7920..0f816efeba 100644
--- a/libical/test-data/2446.ics
+++ b/libical/test-data/2446.ics
@@ -1,10 +1,4 @@
-BEGIN:VCALENDAR
-X-LIC-CLUSTERCOUNT
- :0
-DTSTART
- :00000000T000000
-DTEND
- :00000000T000000   
+
 BEGIN:VCALENDAR
 METHOD:PUBLISH
 PRODID:-//ACME/DesktopCalendar//EN
@@ -17,6 +11,7 @@ SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
 UID:0981234-1234234-23@example.com
 END:VEVENT
 END:VCALENDAR
+
 BEGIN:VCALENDAR
 METHOD:PUBLISH
 VERSION:2.0
@@ -46,7 +41,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:PUBLISH
-SCALE:GREGORIAN
+CALSCALE:GREGORIAN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America-Chicago
@@ -202,7 +197,6 @@ COMMENT:This time works much better and I think the big conference
   room is too big
 UID:calsrv.example.com-873970198738777a@example.com
 SEQUENCE:0
-DTSTAMP:19970611T190000Z
 END:VEVENT
 END:VCALENDAR
 BEGIN:VCALENDAR
@@ -231,10 +225,8 @@ METHOD:DECLINECOUNTER
 VERSION:2.0
 BEGIN:VEVENT
 ORGANIZER:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-COMMENT:Sorry, I cannot change this meeting time
+COMMENT:Sorry\, I cannot change this meeting time
 UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
 DTSTAMP:19970614T190000Z
 END:VEVENT
 END:VCALENDAR
@@ -279,8 +271,6 @@ BEGIN:VEVENT
 ORGANIZER:MAILTO:A@Example.com
 ATTENDEE;PARTSTAT=ACCEPTED;DELEGATED-
  FROM="Mailto:C@example.com":Mailto:E@example.com
-ATTENDEE;PARTSTAT=DELEGATED;
- DELEGATED-TO="Mailto:E@example.com":Mailto:C@example.com
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:0
 REQUEST-STATUS:2.0;Success
@@ -295,9 +285,7 @@ BEGIN:VEVENT
 ORGANIZER:MAILTO:A@Example.com
 ATTENDEE;PARTSTAT=DELEGATED;
  DELEGATED-TO="Mailto:E@example.com":Mailto:C@example.com
-ATTENDEE;PARTSTAT=DECLINED;
- DELEGATED-FROM="Mailto:C@example.com":Mailto:E@example.com
-COMMENT:Sorry, I will be out of town at that time.
+COMMENT:Sorry\, I will be out of town at that time.
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:0
 REQUEST-STATUS:2.0;Success
@@ -577,7 +565,7 @@ CLASS:PUBLIC
 SUMMARY:IETF Calendaring Working Group Meeting
 DTSTART:19970901T210000Z
 DTEND:19970901T220000Z
-LOCATION:Building 32, Microsoft, Seattle, WA
+LOCATION:Building 32\, Microsoft\, Seattle\, WA
 DTSTAMP:19970526T083000Z
 STATUS:CONFIRMED
 END:VEVENT
@@ -630,7 +618,7 @@ VERSION:2.0
 BEGIN:VEVENT
 UID:123456789@host1.com
 SEQUENCE:7
-RRULE:WKST=SU;BYDAY=TH;FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TH
 ORGANIZER:Mailto:A@example.com
 ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
 ATTENDEE;RSVP=TRUE:Mailto:B@example.com
@@ -649,7 +637,7 @@ VERSION:2.0
 BEGIN:VEVENT
 UID:123456789@host1.com
 SEQUENCE:7
-RRULE:WKST=SU;BYDAY=TU,TH;FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TU,TH
 ORGANIZER:Mailto:A@example.com
 ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
 ATTENDEE;RSVP=TRUE:Mailto:B@example.com
@@ -742,13 +730,15 @@ END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:2
 RECURRENCE-ID:19980311T160000Z
-ATTENDEE;ROLE=CHAIR;RSVP=TRUE:Mailto:A@example.com
+ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
 ATTENDEE;RSVP=TRUE:Mailto:B@example.com
 SUMMARY:Review Accounts
 DTSTART:19980311T160000Z
 DTEND:19980304T180000Z
 DTSTAMP:19980306T193000Z
+ORGANIZER:Mailto:A@example.com
 LOCATION:The Small conference room
+UID:guid-1@host1.com
 STATUS:CONFIRMED
 END:VEVENT
 END:VCALENDAR
@@ -873,6 +863,7 @@ BEGIN:VTODO
 ORGANIZER:MAILTO:A@example.com
 ATTENDEE;PARTSTAT=IN-PROCESS:Mailto:B@example.com
 PERCENT-COMPLETE:75
+REQUEST-STATUS:2.0
 UID:calsrv.example.com-873970198738777-00@example.com
 DTSTAMP:19970717T233000Z
 SEQUENCE:0
@@ -886,6 +877,7 @@ BEGIN:VTODO
 ORGANIZER:MAILTO:A@example.com
 ATTENDEE;PARTSTAT=COMPLETED:Mailto:D@example.com
 UID:calsrv.example.com-873970198738777-00@example.com
+REQUEST-STATUS:2.0
 DTSTAMP:19970717T233000Z
 SEQUENCE:0
 END:VTODO
@@ -926,7 +918,7 @@ SUMMARY:Send Status Reports to Area Managers
 UID:calsrv.example.com-873970198738777-00@example.com
 SEQUENCE:0
 DTSTAMP:19970717T200000Z
-STATUS:NEEDS ACTION
+STATUS:NEEDS-ACTION
 PRIORITY:1
 END:VTODO
 END:VCALENDAR
@@ -941,6 +933,8 @@ UID:calsrv.example.com-873970198738777-00@example.com
 DTSTAMP:19970717T233000Z
 RECURRENCE-ID:19980101T170000Z
 SEQUENCE:1
+ORGANIZER:MAILTO:A@Example.com
+REQUEST-STATUS:2.0
 END:VTODO
 END:VCALENDAR
 BEGIN:VCALENDAR
@@ -949,9 +943,10 @@ PRODID:-//ACME/DesktopCalendar//EN
 VERSION:2.0
 BEGIN:VJOURNAL
 DTSTART:19971002T200000Z
+DTSTAMP:19971002T200000Z
 ORGANIZER:MAILTO:A@Example.com
 SUMMARY:Phone conference minutes
-DESCRIPTION:The editors meeting was held on October 1, 1997.
+DESCRIPTION:The editors meeting was held on October 1\, 1997.
   Details are in the attached document.
 UID:0981234-1234234-2410@example.com
 RELATED-TO:0981234-1234234-2402-35@example.com
@@ -965,9 +960,6 @@ VERSION:2.0
 BEGIN:VEVENT
 ORGANIZER:Mailto:A@example.com
 ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
 UID: guid-1-12345@host1.com
 DTSTAMP:19970603T094000
 END:VEVENT
@@ -1004,4 +996,3 @@ UID:acme-12345@host1.com
 DTSTAMP:19970603T094000
 END:VEVENT
 END:VCALENDAR
-END:VCALENDAR
\ No newline at end of file