From 83ddd2563bb77c82363227f900d59211d9c4b860 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Mon, 20 Mar 2017 23:39:46 +0000 Subject: [PATCH] ICU-12816 tzdata2017b to ICU4C/ICU4J. X-SVN-Rev: 39889 --- icu4c/source/data/misc/zoneinfo64.txt | 58 +++++++++++++++------------ icu4j/main/shared/data/icutzdata.jar | 4 +- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index a9b37929795..872958f9017 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,17 +3,17 @@ // License & terms of use: http://www.unicode.org/copyright.html#License //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Wed Mar 1 21:14:16 2017 +// Build date: Mon Mar 20 17:49:58 2017 // tz database: ftp://ftp.iana.org/tz/ -// tz version: 2017a -// ICU version: 59.0.1 +// tz version: 2017b +// ICU version: 59.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2017a" } + TZVersion { "2017b" } Zones:array { /* ACT */ :int { 354 } //Z#0 /* AET */ :int { 366 } //Z#1 @@ -132,7 +132,7 @@ zoneinfo64:table(nofallback) { /* Africa/Mbabane */ :int { 30 } //Z#45 /* Africa/Mogadishu */ :int { 48 } //Z#46 /* Africa/Monrovia */ :table { - trans:intvector { -1604359012, 73529070 } + trans:intvector { -1604359012, 63593070 } typeOffsets:intvector { -2588, 0, -2670, 0, 0, 0 } typeMap:bin { "0102" } } //Z#47 @@ -940,9 +940,12 @@ zoneinfo64:table(nofallback) { } //Z#184 /* America/Port-au-Prince */ :table { transPre32:intvector { -1, 1770463056 } - trans:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600, 1112504400, 1130644800, 1143954000, 1162094400, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600 } + trans:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600, 1112504400, 1130644800, 1143954000, 1162094400, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600, 1489302000, 1509861600 } typeOffsets:intvector { -17360, 0, -18000, 0, -18000, 3600, -17340, 0 } - typeMap:bin { "0301020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + typeMap:bin { "03010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + finalRule { "Haiti" } + finalRaw:int { -18000 } + finalYear:int { 2018 } } //Z#185 /* America/Port_of_Spain */ :table { trans:intvector { -1825098836 } @@ -3103,63 +3106,66 @@ zoneinfo64:table(nofallback) { Fiji:intvector { 10, 1, -1, 7200, 0, 0, 15, -1, 10800, 0, 3600 } //_#12 + Haiti:intvector { + 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 + } //_#13 Iran:intvector { 2, 21, 0, 0, 0, 8, 21, 0, 0, 0, 3600 - } //_#13 + } //_#14 Jordan:intvector { 2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600 - } //_#14 + } //_#15 LH:intvector { 9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800 - } //_#15 + } //_#16 Lebanon:intvector { 2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600 - } //_#16 + } //_#17 Mexico:intvector { 3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#17 + } //_#18 Moldova:intvector { 2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600 - } //_#18 + } //_#19 Morocco:intvector { 2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600 - } //_#19 + } //_#20 NZ:intvector { 8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600 - } //_#20 + } //_#21 Namibia:intvector { 8, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 3600 - } //_#21 + } //_#22 Palestine:intvector { 2, -31, -7, 3600, 0, 9, -31, -7, 3600, 0, 3600 - } //_#22 + } //_#23 Para:intvector { 9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600 - } //_#23 + } //_#24 Syria:intvector { 2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600 - } //_#24 + } //_#25 SystemV:intvector { 3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#25 + } //_#26 Thule:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 - } //_#26 + } //_#27 Tonga:intvector { 10, 1, -1, 7200, 0, 0, 15, -1, 10800, 0, 3600 - } //_#27 + } //_#28 Troll:intvector { 2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200 - } //_#28 + } //_#29 US:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 - } //_#29 + } //_#30 WS:intvector { 8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600 - } //_#30 + } //_#31 Zion:intvector { 2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#31 + } //_#32 } Regions:array { "AU", //Z#0 ACT diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index b1b9263d5a4..3af0a9be5ba 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:d721a5770fabcaf7ee0d0f8059b86b27d18704bcf6a1bccedb10051e1a1cfe2b -size 92424 +oid sha256:9893df309ba571c279dc0673db774e7dedacc54d8a91df2d6a20451814265ef4 +size 92449 -- 2.40.0