SHA256
1
0
forked from pool/timezone
timezone/tzdata-china.diff
Marcus Meissner 6620a7ba51 Accepting request 307993 from home:leonardocf:branches:Base:System
- Fix check for empty components in absolute path
- Fix post-install script to overwrite the temporary file when
  attempting to create /etc/localtime as a hard link [bsc#928841]
- Update to 2015d [bsc#928584, bsc#928246]

OBS-URL: https://build.opensuse.org/request/show/307993
OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=160
2015-05-19 15:52:15 +00:00

41 lines
1.5 KiB
Diff

Index: timezone-2015d/asia
===================================================================
--- timezone-2015d.orig/asia
+++ timezone-2015d/asia
@@ -516,6 +516,10 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:
Zone Asia/Shanghai 8:05:43 - LMT 1901
8:00 Shang C%sT 1949
8:00 PRC C%sT
+
+# Nowadays, China Standard Time is known as "Beijing Time"
+Zone Asia/Beijing 8:00 PRC C%sT
+
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
Zone Asia/Urumqi 5:50:20 - LMT 1928
Index: timezone-2015d/backward
===================================================================
--- timezone-2015d.orig/backward
+++ timezone-2015d/backward
@@ -93,7 +93,7 @@ Link America/Mexico_City Mexico/General
Link Pacific/Auckland NZ
Link Pacific/Chatham NZ-CHAT
Link America/Denver Navajo
-Link Asia/Shanghai PRC
+Link Asia/Beijing PRC
Link Pacific/Pohnpei Pacific/Ponape
Link Pacific/Pago_Pago Pacific/Samoa
Link Pacific/Chuuk Pacific/Truk
Index: timezone-2015d/zone.tab
===================================================================
--- timezone-2015d.orig/zone.tab
+++ timezone-2015d/zone.tab
@@ -143,6 +143,7 @@ CK -2114-15946 Pacific/Rarotonga
CL -3327-07040 America/Santiago most locations
CL -2709-10926 Pacific/Easter Easter Island
CM +0403+00942 Africa/Douala
+CN +3955+11626 Asia/Beijing China Standard Time
CN +3114+12128 Asia/Shanghai Beijing Time
CN +4348+08735 Asia/Urumqi Xinjiang Time
CO +0436-07405 America/Bogota