From d6215a2f3499d3657316295bfc63cca5199165dd Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Fri, 4 May 2018 22:05:27 +0000 Subject: [PATCH] ICU-13666 Revised tzdata2018e in ICU trunk to replace negative DST (Europe/Prague) rules with updated icuzones override. X-SVN-Rev: 41325 --- icu4c/source/data/misc/zoneinfo64.txt | 4 ++-- icu4c/source/tools/tzcode/icuzones | 18 +++++++++++++++++- icu4j/main/shared/data/icutzdata.jar | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 2178faa9ff8..519db6fadad 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,7 +3,7 @@ // License & terms of use: http://www.unicode.org/copyright.html#License //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Fri May 4 03:52:35 2018 +// Build date: Fri May 4 16:06:17 2018 // tz database: ftp://ftp.iana.org/tz/ // tz version: 2018e // ICU version: 61.1 @@ -2292,7 +2292,7 @@ zoneinfo64:table(nofallback) { /* Europe/Prague */ :table { transPre32:intvector { -1, 1825565432 } trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -765327600, -746578800, -733359600, -728517600, -721260000, -716425200, -701910000, -684975600, -670460400, -654217200, -639010800, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } - typeOffsets:intvector { 3464, 0, 3600, -3600, 3600, 0, 3600, 3600 } + typeOffsets:intvector { 3464, 0, 0, 0, 3600, 0, 3600, 3600 } typeMap:bin { "02030203020302030203020302030203020102030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } finalRule { "EU" } finalRaw:int { 3600 } diff --git a/icu4c/source/tools/tzcode/icuzones b/icu4c/source/tools/tzcode/icuzones index 53d2d0d312a..c1ded7ba3ed 100644 --- a/icu4c/source/tools/tzcode/icuzones +++ b/icu4c/source/tools/tzcode/icuzones @@ -130,8 +130,24 @@ Link Europe/Dublin--ICU Eire--ICU # -# tzdata2018e also added another instance of negative DST - Africa/Windhoek +# tzdata2018e also added another instance of negative DST to +# Europe/Prague and Africa/Windhoek # +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Europe/Prague--ICU 0:57:44 - LMT 1850 + 0:57:44 - PMT 1891 Oct # Prague Mean Time + 1:00 C-Eur CE%sT 1945 May 9 + 1:00 Czech CE%sT 1946 Dec 1 3:00 +# Vanguard section, for zic and other parsers that support negative DST. +# 1:00 -1:00 GMT 1947 Feb 23 2:00 +# Rearguard section, for parsers that do not support negative DST. + 0:00 - GMT 1947 Feb 23 2:00 +# End of rearguard section. + 1:00 Czech CE%sT 1979 + 1:00 EU CE%sT + +# Slovakia +Link Europe/Prague--ICU Europe/Bratislava--ICU # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Vanguard section, for zic and other parsers that support negative DST. diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 831f8f03e41..cbe7c569f65 100755 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa5017cc1470fc9d1f78f00e03bfbcac7793cdc12c512abf25b17117457aee90 -size 92870 +oid sha256:5c25f29e8e9f5b7244a63ddc48dd7d69f56612b310e1de8351c9ea80a84afc6f +size 92867