1 Star 0 Fork 22

konglidong/tzdata

forked from src-openEuler/tzdata 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
remove-El_Aaiun-timezone.patch 2.91 KB
一键复制 编辑 原始数据 按行查看 历史
diff --git a/NEWS b/NEWS
index a2db876..22458a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1414,9 +1414,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
@@ -2771,9 +2771,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 724744f..3dfd0a7 100644
--- a/africa
+++ b/africa
@@ -1096,22 +1096,6 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco +00/+01 2018 Oct 28 3:00
1:00 Morocco +01/+00
-# 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 - -01 1976 Apr 14
- 0:00 Morocco +00/+01 2018 Oct 28 3:00
- 1:00 Morocco +01/+00
-
# Mozambique
#
# Shanks gives 1903-03-01 for the transition to CAT.
diff --git a/zone.tab b/zone.tab
index 8c28f76..b9def00 100644
--- a/zone.tab
+++ b/zone.tab
@@ -168,7 +168,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 169feda..a572064 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -157,7 +157,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
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/konglidong/tzdata.git
git@gitee.com:konglidong/tzdata.git
konglidong
tzdata
tzdata
master

搜索帮助

0d507c66 1850385 C8b1a773 1850385