Upgrade timezone data to 2015b
Changes affecting future time stamps
Mongolia will start observing DST again this year, from the last
Saturday in March at 02:00 to the last Saturday in September at 00:00.
(Thanks to Ganbold Tsagaankhuu.)
Palestine will start DST on March 28, not March 27. Also,
correct the fall 2014 transition from September 26 to October 24.
Adjust future predictions accordingly. (Thanks to Steffen Thorsen.)
Changes affecting past time stamps
The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a
regression. (Thanks to Stuart Bishop for reporting the problem.)
Some more zones have been turned into links, when they differed
from existing zones only for older time stamps. As usual,
these changes affect UTC offsets in pre-1970 time stamps only.
Their old contents have been moved to the 'backzone' file.
The affected zones are: America/Antigua, America/Cayman,
Pacific/Midway, and Pacific/Saipan.
Changes affecting time zone abbreviations
Correct the 1992-2010 DST abbreviation in Volgograd from "MSK" to "MSD".
(Thanks to Hank W.)
This also includes ICU4J test changes from:
http://bugs.icu-project.org/trac/changeset/37267
and ICU4C test changes from:
http://bugs.icu-project.org/trac/changeset/37266
Data update obtained from:
ftp://ftp.iana.org/tz/releases/tzdata2015b.tar.gz
The following files generated using ICU build tools:
icu4c/source/data/misc/zoneinfo64.txt
icu4c/source/stubdata/icudt55l.dat
icu4j/main/shared/data/icudata.jar
icu4j/main/shared/data/icutzdata.jar
Some ICU4J tests fail (same before and after, see below).
Some ICU4C test fail (same before and after, see below).
ICU4J test failures from "ant check" (besides ICU4J known failures):
[java] TestAddLikelySubtags {
[java] Error: (ULocaleTest.java:3838) Original: und_Arab_SN expected: wo_Arab_SN - but got ar_Arab_SN
[java] Error: (ULocaleTest.java:3838) Original: und_Cyrl_KZ expected: kk_Cyrl_KZ - but got ru_Cyrl_KZ
[java] Error: (ULocaleTest.java:3838) Original: und_Ethi_ER expected: ti_Ethi_ER - but got am_Ethi_ER
[java] Error: (ULocaleTest.java:3838) Original: und_GU expected: ch_Latn_GU - but got en_Latn_GU
[java] Error: (ULocaleTest.java:3838) Original: und_Latn_ZA expected: af_Latn_ZA - but got en_Latn_ZA
[java] Error: (ULocaleTest.java:3838) Original: und_NR expected: na_Latn_NR - but got en_Latn_NR
[java] } (0.030s) FAILED (6 failure(s))
ICU4C test failures:
-------------
| *** FAILING TEST SUMMARY FOR: intltest
TestG7Locales
G7CollationTest
TestProperty
CollationAPITest
TestDataDriven
CollationTest
collate
| *** END FAILING TEST SUMMARY FOR: intltest
-------------
| *** FAILING TEST SUMMARY FOR: cintltst
/tsutil/creststn/TestGetVersionColl
/tscoll/capitst/TestProperty
/tscoll/cg7coll/TestG7Locales
/tscoll/cmsccoll/TestImportRulesDeWithPhonebook
/tscoll/cmsccoll/TestImport
/tscoll/cmsccoll/TestImportWithType
| *** END FAILING TEST SUMMARY FOR: cintltst
---------------
ALL TESTS SUMMARY:
ok: testdata iotest letest
===== ERRS: intltest cintltst
Bug: 19887183
Change-Id: I1b4bdc5ae5cf778908a77893d7f8db8a4117e1e1
diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt
index c131c73..7948198 100644
--- a/icu4c/source/data/misc/zoneinfo64.txt
+++ b/icu4c/source/data/misc/zoneinfo64.txt
@@ -3,17 +3,17 @@
// Corporation and others. All Rights Reserved.
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Tue Feb 3 16:54:37 2015
+// Build date: Thu Apr 9 09:32:10 2015
// tz database: ftp://ftp.iana.org/tz/
-// tz version: 2015a
-// ICU version: 55.0.1
+// tz version: 2015b
+// ICU version: 55.1
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
// >> !!! >>> DO NOT EDIT <<< !!! <<
//---------------------------------------------------------
zoneinfo64:table(nofallback) {
- TZVersion { "2015a" }
+ TZVersion { "2015b" }
Zones:array {
/* ACT */ :int { 347 } //Z#0
/* AET */ :int { 359 } //Z#1
@@ -198,11 +198,7 @@
links:intvector { 4, 60, 603 }
} //Z#60
/* America/Anguilla */ :int { 185 } //Z#61
- /* America/Antigua */ :table {
- trans:intvector { -1825098768, -599598000 }
- typeOffsets:intvector { -14832, 0, -18000, 0, -14400, 0 }
- typeMap:bin { "0102" }
- } //Z#62
+ /* America/Antigua */ :int { 185 } //Z#62
/* America/Araguaina */ :table {
trans:intvector { -1767214032, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -191365200, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 813726000, 824004000, 844570800, 856058400, 876106800, 888717600, 908074800, 919562400, 938919600, 951616800, 970974000, 982461600, 1003028400, 1013911200, 1036292400, 1045360800, 1350788400, 1361066400 }
typeOffsets:intvector { -11568, 0, -10800, 0, -10800, 3600 }
@@ -390,12 +386,7 @@
typeOffsets:intvector { -12560, 0, -14400, 0, -10800, 0 }
typeMap:bin { "0102" }
} //Z#96
- /* America/Cayman */ :table {
- transPre32:intvector { -1, 1770465228 }
- trans:intvector { -1827687169 }
- typeOffsets:intvector { -19532, 0, -18431, 0, -18000, 0 }
- typeMap:bin { "0102" }
- } //Z#97
+ /* America/Cayman */ :int { 180 } //Z#97
/* America/Chicago */ :table {
transPre32:intvector { -1, 1577320096 }
trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -1563724800, -1551632400, -1538928000, -1520182800, -1504454400, -1491757200, -1473004800, -1459702800, -1441555200, -1428253200, -1410105600, -1396803600, -1378656000, -1365354000, -1347206400, -1333904400, -1315152000, -1301850000, -1283702400, -1270400400, -1252252800, -1238950800, -1220803200, -1207501200, -1189353600, -1176051600, -1157299200, -1144602000, -1125849600, -1112547600, -1094400000, -1081098000, -1067788800, -1045414800, -1031500800, -1018198800, -1000051200, -986749200, -967996800, -955299600, -936547200, -923245200, -905097600, -891795600, -880214400, -765392400, -747244800, -733942800, -715795200, -702493200, -684345600, -671043600, -652896000, -639594000, -620841600, -608144400, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -463593600, -447267600, -431539200, -415818000, -400089600, -384368400, -368640000, -352918800, -337190400, -321469200, -305740800, -289414800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -163616400, -147888000, -131562000, -116438400, -100112400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 152089200, 162374400, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 }
@@ -930,6 +921,7 @@
trans:intvector { -1946918424 }
typeOffsets:intvector { -19088, 0, -19176, 0, -18000, 0 }
typeMap:bin { "0102" }
+ links:intvector { 97, 180 }
} //Z#180
/* America/Pangnirtung */ :table {
trans:intvector { -1546300800, -880221600, -765399600, -147902400, -131572800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954662400, 972802800, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 }
@@ -964,7 +956,7 @@
trans:intvector { -1825098836 }
typeOffsets:intvector { -14764, 0, -14400, 0 }
typeMap:bin { "01" }
- links:intvector { 61, 111, 122, 123, 156, 170, 185, 204, 206, 207, 208, 209, 216, 218 }
+ links:intvector { 61, 62, 111, 122, 123, 156, 170, 185, 204, 206, 207, 208, 209, 216, 218 }
} //Z#185
/* America/Porto_Acre */ :int { 194 } //Z#186
/* America/Porto_Velho */ :table {
@@ -1324,9 +1316,12 @@
typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030501" }
} //Z#252
/* Asia/Choibalsan */ :table {
- trans:intvector { -2032933080, 252435600, 417974400, 433778400, 449593200, 465314400, 481042800, 496764000, 512492400, 528213600, 543942000, 559663200, 575391600, 591112800, 606841200, 622562400, 638290800, 654616800, 670345200, 686066400, 701794800, 717516000, 733244400, 748965600, 764694000, 780415200, 796143600, 811864800, 828198000, 843919200, 859647600, 875368800, 891097200, 906818400, 988390800, 1001692800, 1017421200, 1033142400, 1048870800, 1064592000, 1080320400, 1096041600, 1111770000, 1127491200, 1143219600, 1159545600, 1206889200 }
- typeOffsets:intvector { 27480, 0, 25200, 0, 28800, 0, 32400, 0, 32400, 3600 }
- typeMap:bin { "0102040304030403040304030403040304030403040304030403040304030403040304030403040304030403040302" }
+ trans:intvector { -2032933080, 252435600, 417974400, 433778400, 449593200, 465314400, 481042800, 496764000, 512492400, 528213600, 543942000, 559663200, 575391600, 591112800, 606841200, 622562400, 638290800, 654616800, 670345200, 686066400, 701794800, 717516000, 733244400, 748965600, 764694000, 780415200, 796143600, 811864800, 828198000, 843919200, 859647600, 875368800, 891097200, 906818400, 988390800, 1001692800, 1017421200, 1033142400, 1048870800, 1064592000, 1080320400, 1096041600, 1111770000, 1127491200, 1143219600, 1159545600, 1206889200, 1427479200, 1443193200 }
+ typeOffsets:intvector { 27480, 0, 25200, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600 }
+ typeMap:bin { "01020504050405040504050405040504050405040504050405040504050405040504050405040504050405040504020302" }
+ finalRule { "Mongol" }
+ finalRaw:int { 28800 }
+ finalYear:int { 2016 }
} //Z#253
/* Asia/Chongqing */ :int { 308 } //Z#254
/* Asia/Chungking */ :int { 308 } //Z#255
@@ -1370,22 +1365,22 @@
} //Z#262
/* Asia/Gaza */ :table {
transPre32:intvector { -1, 2109557424 }
- trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1219957200, 1238104800, 1252015200, 1269640860, 1281474000, 1301608860, 1312146000, 1333058400, 1348178400, 1364508000, 1380229200 }
+ trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1219957200, 1238104800, 1252015200, 1269640860, 1281474000, 1301608860, 1312146000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445547600 }
typeOffsets:intvector { 8272, 0, 7200, 0, 7200, 3600 }
- typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "Palestine" }
finalRaw:int { 7200 }
- finalYear:int { 2014 }
+ finalYear:int { 2016 }
} //Z#263
/* Asia/Harbin */ :int { 308 } //Z#264
/* Asia/Hebron */ :table {
transPre32:intvector { -1, 2109557273 }
- trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1220216400, 1238104800, 1252015200, 1269554400, 1281474000, 1301608860, 1312146000, 1314655200, 1317330000, 1333058400, 1348178400, 1364508000, 1380229200 }
+ trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1220216400, 1238104800, 1252015200, 1269554400, 1281474000, 1301608860, 1312146000, 1314655200, 1317330000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445547600 }
typeOffsets:intvector { 8423, 0, 7200, 0, 7200, 3600 }
- typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "Palestine" }
finalRaw:int { 7200 }
- finalYear:int { 2014 }
+ finalYear:int { 2016 }
} //Z#265
/* Asia/Ho_Chi_Minh */ :table {
trans:intvector { -2004073600, -1851577590, -852105600, -782643600, -767869200, -718095600, -457776000, -315648000, 171820800 }
@@ -1400,9 +1395,12 @@
links:intvector { 267, 499 }
} //Z#267
/* Asia/Hovd */ :table {
- trans:intvector { -2032927596, 252439200, 417978000, 433785600, 449600400, 465321600, 481050000, 496771200, 512499600, 528220800, 543949200, 559670400, 575398800, 591120000, 606848400, 622569600, 638298000, 654624000, 670352400, 686073600, 701802000, 717523200, 733251600, 748972800, 764701200, 780422400, 796150800, 811872000, 828205200, 843926400, 859654800, 875376000, 891104400, 906825600, 988398000, 1001700000, 1017428400, 1033149600, 1048878000, 1064599200, 1080327600, 1096048800, 1111777200, 1127498400, 1143226800, 1159552800 }
+ trans:intvector { -2032927596, 252439200, 417978000, 433785600, 449600400, 465321600, 481050000, 496771200, 512499600, 528220800, 543949200, 559670400, 575398800, 591120000, 606848400, 622569600, 638298000, 654624000, 670352400, 686073600, 701802000, 717523200, 733251600, 748972800, 764701200, 780422400, 796150800, 811872000, 828205200, 843926400, 859654800, 875376000, 891104400, 906825600, 988398000, 1001700000, 1017428400, 1033149600, 1048878000, 1064599200, 1080327600, 1096048800, 1111777200, 1127498400, 1143226800, 1159552800, 1427482800, 1443196800 }
typeOffsets:intvector { 21996, 0, 21600, 0, 25200, 0, 25200, 3600 }
- typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" }
+ typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" }
+ finalRule { "Mongol" }
+ finalRaw:int { 25200 }
+ finalYear:int { 2016 }
} //Z#268
/* Asia/Irkutsk */ :table {
trans:intvector { -1575874625, -1247554800, 354902400, 370710000, 386438400, 402246000, 417974400, 433782000, 449596800, 465328800, 481053600, 496778400, 512503200, 528228000, 543952800, 559677600, 575402400, 591127200, 606852000, 622576800, 638301600, 654631200, 670356000, 686084400, 695761200, 701794800, 717516000, 733255200, 748980000, 764704800, 780429600, 796154400, 811879200, 828208800, 846352800, 859658400, 877802400, 891108000, 909252000, 922557600, 941306400, 954007200, 972756000, 985456800, 1004205600, 1017511200, 1035655200, 1048960800, 1067104800, 1080410400, 1099159200, 1111860000, 1130608800, 1143309600, 1162058400, 1174759200, 1193508000, 1206813600, 1224957600, 1238263200, 1256407200, 1269712800, 1288461600, 1301162400, 1414256400 }
@@ -1646,9 +1644,12 @@
} //Z#318
/* Asia/Ujung_Pandang */ :int { 289 } //Z#319
/* Asia/Ulaanbaatar */ :table {
- trans:intvector { -2032931252, 252435600, 417974400, 433782000, 449596800, 465318000, 481046400, 496767600, 512496000, 528217200, 543945600, 559666800, 575395200, 591116400, 606844800, 622566000, 638294400, 654620400, 670348800, 686070000, 701798400, 717519600, 733248000, 748969200, 764697600, 780418800, 796147200, 811868400, 828201600, 843922800, 859651200, 875372400, 891100800, 906822000, 988394400, 1001696400, 1017424800, 1033146000, 1048874400, 1064595600, 1080324000, 1096045200, 1111773600, 1127494800, 1143223200, 1159549200 }
+ trans:intvector { -2032931252, 252435600, 417974400, 433782000, 449596800, 465318000, 481046400, 496767600, 512496000, 528217200, 543945600, 559666800, 575395200, 591116400, 606844800, 622566000, 638294400, 654620400, 670348800, 686070000, 701798400, 717519600, 733248000, 748969200, 764697600, 780418800, 796147200, 811868400, 828201600, 843922800, 859651200, 875372400, 891100800, 906822000, 988394400, 1001696400, 1017424800, 1033146000, 1048874400, 1064595600, 1080324000, 1096045200, 1111773600, 1127494800, 1143223200, 1159549200, 1427479200, 1443193200 }
typeOffsets:intvector { 25652, 0, 25200, 0, 28800, 0, 28800, 3600 }
- typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" }
+ typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" }
+ finalRule { "Mongol" }
+ finalRaw:int { 28800 }
+ finalYear:int { 2016 }
links:intvector { 320, 321 }
} //Z#320
/* Asia/Ulan_Bator */ :int { 320 } //Z#321
@@ -2552,9 +2553,9 @@
} //Z#543
/* Pacific/Easter */ :table {
transPre32:intvector { -1, 1770471960 }
- trans:intvector { -1178124152, -870552000, -865278000, -736376400, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384836400, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1430017200 }
+ trans:intvector { -1178124152, -870552000, -865278000, -736376400, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1430017200 }
typeOffsets:intvector { -26264, 0, -26248, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600, -18000, 0 }
- typeMap:bin { "01030203020302030203020302030203020302030203020302030203020302030504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" }
+ typeMap:bin { "010302030203020302030203020302030203020302030203020302030203020304050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" }
links:intvector { 386, 544 }
} //Z#544
/* Pacific/Efate */ :table {
@@ -2607,6 +2608,7 @@
transPre32:intvector { -1, 350340556, -1, 2117479756 }
typeOffsets:intvector { -51660, 0, 34740, 0, 36000, 0 }
typeMap:bin { "0102" }
+ links:intvector { 553, 573 }
} //Z#553
/* Pacific/Honolulu */ :table {
transPre32:intvector { -1, 1960865982 }
@@ -2646,12 +2648,7 @@
typeOffsets:intvector { -33480, 0, -34200, 0 }
typeMap:bin { "01" }
} //Z#560
- /* Pacific/Midway */ :table {
- transPre32:intvector { -1, 2117557064 }
- trans:intvector { -428504400, -420645600 }
- typeOffsets:intvector { -42568, 0, -39600, 0, -39600, 3600 }
- typeMap:bin { "010201" }
- } //Z#561
+ /* Pacific/Midway */ :int { 566 } //Z#561
/* Pacific/Nauru */ :table {
trans:intvector { -1545131260, -877347000, -800960400, 294323400 }
typeOffsets:intvector { 40060, 0, 32400, 0, 41400, 0, 43200, 0 }
@@ -2679,7 +2676,7 @@
trans:intvector { -1861879032 }
typeOffsets:intvector { 45432, 0, -40968, 0, -39600, 0 }
typeMap:bin { "0102" }
- links:intvector { 566, 574, 615 }
+ links:intvector { 561, 566, 574, 615 }
} //Z#566
/* Pacific/Palau */ :table {
transPre32:intvector { -1, 2117482220 }
@@ -2710,12 +2707,7 @@
typeOffsets:intvector { -38344, 0, -37800, 0, -36000, 0, -36000, 1800 }
typeMap:bin { "010302030203020302030203020302030203020302030203020302" }
} //Z#572
- /* Pacific/Saipan */ :table {
- transPre32:intvector { -1, 350340316, -1, 2117479516 }
- trans:intvector { -7981200 }
- typeOffsets:intvector { -51420, 0, 32400, 0, 34980, 0, 36000, 0 }
- typeMap:bin { "020103" }
- } //Z#573
+ /* Pacific/Saipan */ :int { 553 } //Z#573
/* Pacific/Samoa */ :int { 566 } //Z#574
/* Pacific/Tahiti */ :table {
trans:intvector { -1806674504 }
@@ -3096,45 +3088,48 @@
Mexico:intvector {
3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
} //_#18
+ Mongol:intvector {
+ 2, -31, -7, 7200, 0, 8, -30, -7, 0, 0, 3600
+ } //_#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
- Palestine:intvector {
- 2, -31, -5, 86400, 0, 8, 21, -6, 0, 0, 3600
} //_#22
+ Palestine:intvector {
+ 2, -31, -6, 86400, 0, 9, 21, -6, 0, 0, 3600
+ } //_#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
Troll:intvector {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200
- } //_#27
+ } //_#28
US:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#28
+ } //_#29
Uruguay:intvector {
9, 1, -1, 7200, 0, 2, 8, -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/icu4c/source/stubdata/icudt55l.dat b/icu4c/source/stubdata/icudt55l.dat
index cfc3ac2..94e0b29 100644
--- a/icu4c/source/stubdata/icudt55l.dat
+++ b/icu4c/source/stubdata/icudt55l.dat
Binary files differ
diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp
index fdb1a20..757bde5 100644
--- a/icu4c/source/test/intltest/tztest.cpp
+++ b/icu4c/source/test/intltest/tztest.cpp
@@ -2014,23 +2014,25 @@
{"Africa/Ouagadougou", "Africa/Abidjan"},
{"Africa/Porto-Novo", "Africa/Lagos"},
{"Africa/Sao_Tome", "Africa/Abidjan"},
+ {"America/Antigua", "America/Port_of_Spain"},
+ {"America/Anguilla", "America/Port_of_Spain"},
{"America/Curacao", "America/Aruba"},
- {"America/Dominica", "America/Anguilla"},
- {"America/Grenada", "America/Anguilla"},
- {"America/Guadeloupe", "America/Anguilla"},
+ {"America/Dominica", "America/Port_of_Spain"},
+ {"America/Grenada", "America/Port_of_Spain"},
+ {"America/Guadeloupe", "America/Port_of_Spain"},
{"America/Kralendijk", "America/Aruba"},
{"America/Lower_Princes", "America/Aruba"},
- {"America/Marigot", "America/Anguilla"},
- {"America/Montserrat", "America/Anguilla"},
- {"America/Port_of_Spain", "America/Anguilla"},
- {"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
- {"America/St_Barthelemy", "America/Anguilla"},
- {"America/St_Kitts", "America/Anguilla"},
- {"America/St_Lucia", "America/Anguilla"},
- {"America/St_Thomas", "America/Anguilla"},
- {"America/St_Vincent", "America/Anguilla"},
- {"America/Tortola", "America/Anguilla"},
- {"America/Virgin", "America/Anguilla"},
+ {"America/Marigot", "America/Port_of_Spain"},
+ {"America/Montserrat", "America/Port_of_Spain"},
+ {"America/Panama", "America/Cayman"},
+ {"America/Shiprock", "America/Denver"},
+ {"America/St_Barthelemy", "America/Port_of_Spain"},
+ {"America/St_Kitts", "America/Port_of_Spain"},
+ {"America/St_Lucia", "America/Port_of_Spain"},
+ {"America/St_Thomas", "America/Port_of_Spain"},
+ {"America/St_Vincent", "America/Port_of_Spain"},
+ {"America/Tortola", "America/Port_of_Spain"},
+ {"America/Virgin", "America/Port_of_Spain"},
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
{"Arctic/Longyearbyen", "Europe/Oslo"},
{"Asia/Kuwait", "Asia/Aden"},
@@ -2060,6 +2062,8 @@
{"Indian/Mayotte", "Africa/Nairobi"},
{"Pacific/Auckland", "Antarctica/McMurdo"},
{"Pacific/Johnston", "Pacific/Honolulu"},
+ {"Pacific/Midway", "Pacific/Pago_Pago"},
+ {"Pacific/Saipan", "Pacific/Guam"},
{0, 0}
};
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
old mode 100755
new mode 100644
index 06c653c..f94fd89
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
Binary files differ
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
old mode 100755
new mode 100644
index b510e83..2127e90
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
Binary files differ
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
index 05e0411..a4c2c1b 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
@@ -1509,23 +1509,25 @@
{"Africa/Ouagadougou", "Africa/Abidjan"},
{"Africa/Porto-Novo", "Africa/Lagos"},
{"Africa/Sao_Tome", "Africa/Abidjan"},
+ {"America/Antigua", "America/Port_of_Spain"},
+ {"America/Anguilla", "America/Port_of_Spain"},
{"America/Curacao", "America/Aruba"},
- {"America/Dominica", "America/Anguilla"},
- {"America/Grenada", "America/Anguilla"},
- {"America/Guadeloupe", "America/Anguilla"},
+ {"America/Dominica", "America/Port_of_Spain"},
+ {"America/Grenada", "America/Port_of_Spain"},
+ {"America/Guadeloupe", "America/Port_of_Spain"},
{"America/Kralendijk", "America/Aruba"},
{"America/Lower_Princes", "America/Aruba"},
- {"America/Marigot", "America/Anguilla"},
- {"America/Montserrat", "America/Anguilla"},
- {"America/Port_of_Spain", "America/Anguilla"},
- {"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
- {"America/St_Barthelemy", "America/Anguilla"},
- {"America/St_Kitts", "America/Anguilla"},
- {"America/St_Lucia", "America/Anguilla"},
- {"America/St_Thomas", "America/Anguilla"},
- {"America/St_Vincent", "America/Anguilla"},
- {"America/Tortola", "America/Anguilla"},
- {"America/Virgin", "America/Anguilla"},
+ {"America/Marigot", "America/Port_of_Spain"},
+ {"America/Montserrat", "America/Port_of_Spain"},
+ {"America/Panama", "America/Cayman"},
+ {"America/Shiprock", "America/Denver"},
+ {"America/St_Barthelemy", "America/Port_of_Spain"},
+ {"America/St_Kitts", "America/Port_of_Spain"},
+ {"America/St_Lucia", "America/Port_of_Spain"},
+ {"America/St_Thomas", "America/Port_of_Spain"},
+ {"America/St_Vincent", "America/Port_of_Spain"},
+ {"America/Tortola", "America/Port_of_Spain"},
+ {"America/Virgin", "America/Port_of_Spain"},
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
{"Arctic/Longyearbyen", "Europe/Oslo"},
{"Asia/Kuwait", "Asia/Aden"},
@@ -1555,6 +1557,8 @@
{"Indian/Mayotte", "Africa/Nairobi"},
{"Pacific/Auckland", "Antarctica/McMurdo"},
{"Pacific/Johnston", "Pacific/Honolulu"},
+ {"Pacific/Midway", "Pacific/Pago_Pago"},
+ {"Pacific/Saipan", "Pacific/Guam"},
};
// Following IDs are aliases of Etc/GMT in CLDR,
