diff options
Diffstat (limited to 'remove-El_Aaiun-timezone.patch')
| -rw-r--r-- | remove-El_Aaiun-timezone.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/remove-El_Aaiun-timezone.patch b/remove-El_Aaiun-timezone.patch new file mode 100644 index 0000000..4aba4ae --- /dev/null +++ b/remove-El_Aaiun-timezone.patch @@ -0,0 +1,78 @@ +diff --git a/NEWS b/NEWS +index 7ce4f43..199ebf0 100644 +--- a/NEWS ++++ b/NEWS +@@ -2808,9 +2808,9 @@ Release 2016g - 2016-09-13 08:56:38 -0700 + zic no longer generates binary files containing POSIX TZ-like + strings that disagree with the local time type after the last + explicit transition in the data. This fixes a bug with +- Africa/Casablanca and Africa/El_Aaiun in some year-2037 timestamps +- on the reference platform. (Thanks to Alexander Belopolsky for +- reporting the bug and suggesting a way forward.) ++ Africa/Casablanca in some year-2037 timestamps on the reference ++ platform. (Thanks to Alexander Belopolsky for reporting the bug ++ and suggesting a way forward.) + + If the installed localtime and/or posixrules files are symbolic + links, zic now keeps them symbolic links when updating them, for +@@ -4165,9 +4165,6 @@ Release 2013h - 2013-10-25 15:32:32 -0700 + Libya has switched its UT offset back to +02 without DST, instead + of +01 with DST. (Thanks to Even Scharning.) + +- Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules. +- (Thanks to Gwillim Law.) +- + Changes affecting future timestamps: + + Acre and (we guess) western Amazonas will switch from UT -04 to -05 +diff --git a/africa b/africa +index fd6c44a..7514cb7 100644 +--- a/africa ++++ b/africa +@@ -1073,22 +1073,6 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 + 0:00 Morocco %z 2018 Oct 28 3:00 + 1:00 Morocco %z + +-# Western Sahara +-# +-# From Gwillim Law (2013-10-22): +-# A correspondent who is usually well informed about time zone matters +-# ... says that Western Sahara observes daylight saving time, just as +-# Morocco does. +-# +-# From Paul Eggert (2013-10-23): +-# Assume that this has been true since Western Sahara switched to GMT, +-# since most of it was then controlled by Morocco. +- +-Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún +- -1:00 - %z 1976 Apr 14 +- 0:00 Morocco %z 2018 Oct 28 3:00 +- 1:00 Morocco %z +- + # Botswana + # Burundi + # Democratic Republic of the Congo (eastern) +diff --git a/zone.tab b/zone.tab +index 9958424..001928e 100644 +--- a/zone.tab ++++ b/zone.tab +@@ -166,7 +166,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland) + EC -0054-08936 Pacific/Galapagos Galapagos Islands + EE +5925+02445 Europe/Tallinn + EG +3003+03115 Africa/Cairo +-EH +2709-01312 Africa/El_Aaiun + ER +1520+03853 Africa/Asmara + ES +4024-00341 Europe/Madrid Spain (mainland) + ES +3553-00519 Africa/Ceuta Ceuta, Melilla +diff --git a/zone1970.tab b/zone1970.tab +index c78b305..b83bf7b 100644 +--- a/zone1970.tab ++++ b/zone1970.tab +@@ -144,7 +144,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland) + EC -0054-08936 Pacific/Galapagos Galápagos Islands + EE +5925+02445 Europe/Tallinn + EG +3003+03115 Africa/Cairo +-EH +2709-01312 Africa/El_Aaiun + ES +4024-00341 Europe/Madrid Spain (mainland) + ES +3553-00519 Africa/Ceuta Ceuta, Melilla + ES +2806-01524 Atlantic/Canary Canary Islands |