From 55c463dd9412ca012e400e5c323dc91da4030a5d Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Fri, 4 Nov 2016 03:10:08 -0700
Subject: [PATCH] eds_event.ics.exchange.tem.patch: adapt to Exchange 2016

Switching the testing to Exchange 2016 revealed a slightly
different time zone mangling than before:
- the "US & C" time zone name already gets truncated before the C
- due to recent rules on the server (?), several TZNAMEs get
  changed

Updating the data again...
---
 .../eds_event.ics.exchange.tem.patch          | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/test/testcases/eds_event.ics.exchange.tem.patch b/test/testcases/eds_event.ics.exchange.tem.patch
index 2a726ff7..c2d86bc5 100644
--- a/test/testcases/eds_event.ics.exchange.tem.patch
+++ b/test/testcases/eds_event.ics.exchange.tem.patch
@@ -1,4 +1,4 @@
-@@ -2,19 +2,16 @@
+@@ -2,19 +2,18 @@
  PRODID:-//Ximian//NONSGML Evolution Calendar//EN
  VERSION:2.0
  BEGIN:VTIMEZONE
@@ -9,6 +9,7 @@
  TZOFFSETFROM:+0100
  TZOFFSETTO:+0200
 -TZNAME:CEST
++TZNAME:Customized Time Zone
  DTSTART:19700329T020000
  RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
  END:DAYLIGHT
@@ -16,10 +17,11 @@
  TZOFFSETFROM:+0200
  TZOFFSETTO:+0100
 -TZNAME:CET
++TZNAME:Standard Timezone
  DTSTART:19701025T030000
  RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
  END:STANDARD
-@@ -23,9 +20,9 @@
+@@ -23,9 +22,9 @@
  SUMMARY:phone meeting
  DESCRIPTION:let's talk
  CATEGORIES:MEETING
@@ -31,7 +33,7 @@
   20060406T160000
  UID:20060406T211449Z-4562-727-1-63@gollum
  DTSTAMP:20060406T211449Z
-@@ -35,6 +32,7 @@
+@@ -35,6 +34,7 @@
  CLASS:PUBLIC
  TRANSP:OPAQUE
  SEQUENCE:1
@@ -39,7 +41,7 @@
  END:VEVENT
  END:VCALENDAR
  
-@@ -53,7 +51,7 @@
+@@ -53,7 +53,7 @@
  CLASS:PUBLIC
  CREATED:20060416T203724Z
  LAST-MODIFIED:20060416T203758Z
@@ -48,7 +50,7 @@
  END:VEVENT
  END:VCALENDAR
  
-@@ -90,7 +88,7 @@
+@@ -90,7 +90,7 @@
  CLASS:PUBLIC
  CREATED:20060416T203924Z
  LAST-MODIFIED:20060416T203949Z
@@ -57,7 +59,7 @@
  END:VEVENT
  END:VCALENDAR
  
-@@ -106,7 +104,7 @@
+@@ -106,7 +106,7 @@
  SEQUENCE:2
  SUMMARY:recurrence\, yearly\, two times
  CLASS:PUBLIC
@@ -66,25 +68,25 @@
  CREATED:20060416T204021Z
  LAST-MODIFIED:20060416T204021Z
  END:VEVENT
-@@ -193,11 +191,28 @@
+@@ -193,11 +193,28 @@
  BEGIN:VCALENDAR
  PRODID:-//Ximian//NONSGML Evolution Calendar//EN
  VERSION:2.0
 +BEGIN:VTIMEZONE
-+TZID:(UTC-05:00) Eastern Time (US & C
++TZID:(UTC-05:00) Eastern Time (US)
 +BEGIN:STANDARD
 +DTSTART:19701101T020000
 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 +TZOFFSETFROM:-0400
 +TZOFFSETTO:-0500
-+TZNAME:(UTC-05:00) Eastern Time (US & C
++TZNAME:(UTC-05:00) Eastern Time (US)
 +END:STANDARD
 +BEGIN:DAYLIGHT
 +DTSTART:19700308T020000
 +RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 +TZOFFSETFROM:-0500
 +TZOFFSETTO:-0400
-+TZNAME:(UTC-05:00) Eastern Time (US & C
++TZNAME:Customized Time Zone
 +END:DAYLIGHT
 +END:VTIMEZONE
  BEGIN:VEVENT
@@ -92,12 +94,12 @@
  DTSTAMP:20060416T204136Z
 -DTSTART:20060406T190000Z
 -DTEND:20060406T193000Z
-+DTSTART;TZID="(UTC-05:00) Eastern Time (US & C":20060406T150000
-+DTEND;TZID="(UTC-05:00) Eastern Time (US & C":20060406T153000
++DTSTART;TZID="(UTC-05:00) Eastern Time (US)":20060406T150000
++DTEND;TZID="(UTC-05:00) Eastern Time (US)":20060406T153000
  TRANSP:TRANSPARENT
  SEQUENCE:4
  SUMMARY:all fields
-@@ -218,7 +233,7 @@
+@@ -218,7 +235,7 @@
  BEGIN:VALARM
  X-EVOLUTION-ALARM-UID:20060416T204833Z-4250-727-1-85@gollum
  ACTION:DISPLAY
@@ -106,7 +108,7 @@
  TRIGGER;VALUE=DURATION;RELATED=START:-PT1H
  END:VALARM
  END:VEVENT
-@@ -228,29 +243,6 @@
+@@ -228,29 +245,6 @@
  PRODID:-//Ximian//NONSGML Evolution Calendar//EN
  VERSION:2.0
  BEGIN:VEVENT
@@ -136,7 +138,7 @@
  UID:20080407T193125Z-19554-727-1-50@gollum
  DTSTAMP:20080407T193125Z
  DTSTART:20080406T090000Z
-@@ -260,7 +252,7 @@
+@@ -260,7 +254,7 @@
  SUMMARY:Recurring
  DESCRIPTION:recurs each Sonday\, 10 times
  CLASS:PUBLIC
@@ -145,7 +147,7 @@
  CREATED:20080407T193241Z
  LAST-MODIFIED:20080407T193241
  END:VEVENT
-@@ -341,75 +333,3 @@
+@@ -341,75 +335,3 @@
  DESCRIPTION:second instance modified\, single detached recurrence
  END:VEVENT
  END:VCALENDAR