From 204058d84c413c9b044532f10947e3d92472718a Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Wed, 30 Oct 2013 01:51:29 +0000 Subject: [PATCH] ICU-10434 tzdata2013h to ICU4C X-SVN-Rev: 34625 --- icu4c/source/data/misc/metaZones.txt | 15 +++++++++ icu4c/source/data/misc/zoneinfo64.txt | 46 +++++++++++++++------------ 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt index 0de028a6489..b74bf111f36 100644 --- a/icu4c/source/data/misc/metaZones.txt +++ b/icu4c/source/data/misc/metaZones.txt @@ -1058,6 +1058,11 @@ metaZones:table(nofallback){ { "Europe_Central", "2012-11-10 00:00", + "2013-10-25 00:00", + } + { + "Europe_Eastern", + "2013-10-25 00:00", "9999-12-31 23:59", } } @@ -1563,6 +1568,11 @@ metaZones:table(nofallback){ { "Amazon", "2008-06-24 05:00", + "2013-11-10 04:00", + } + { + "Acre", + "2013-11-10 04:00", "9999-12-31 23:59", } } @@ -2278,6 +2288,11 @@ metaZones:table(nofallback){ { "Amazon", "2008-06-24 05:00", + "2013-11-10 04:00", + } + { + "Acre", + "2013-11-10 04:00", "9999-12-31 23:59", } } diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 4d3e6c48d2f..0f063d19e74 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: Wed Oct 2 17:53:53 2013 +// Build date: Tue Oct 29 19:23:04 2013 // Olson source: ftp://elsie.nci.nih.gov/pub/ -// Olson version: 2013g -// ICU version: 52.1 +// Olson version: 2013h +// ICU version: 53.0.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2013g" } + TZVersion { "2013h" } Zones:array { /* ACT */ :int { 347 } //Z#0 /* AET */ :int { 359 } //Z#1 @@ -96,9 +96,12 @@ zoneinfo64:table(nofallback) { } //Z#18 /* Africa/Casablanca */ :table { trans:intvector { -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1404007200, 1406599200, 1414288800, 1427594400, 1434592800, 1437184800, 1445738400, 1459044000, 1465264800, 1467856800, 1477792800, 1490493600, 1495850400, 1498442400, 1509242400, 1521943200, 1526436000, 1529028000, 1540692000, 1553997600, 1557108000, 1559700000, 1572141600, 1585447200, 1587693600, 1590285600, 1603591200, 1616896800, 1618279200, 1620871200, 1635645600, 1648346400, 1648951200, 1651543200, 1667095200, 1682128800, 1698544800, 1712714400, 1729994400, 1743386400, 1761444000, 1774749600, 1792893600, 1806199200, 1824948000, 1837648800, 1856397600, 1869098400, 1887847200, 1901152800, 1919296800, 1932602400, 1950746400, 1964052000, 1982800800, 1995501600, 2014250400, 2026951200, 2045700000, 2058400800, 2077149600, 2090455200, 2108167200, 2121904800, 2138839200 } - transPost32:intvector { 0, -2141612896 } + transPost32:intvector { 0, -2141612896, 0, -2125542496, 0, -2122950496, 0, -2122864096, 0, -2110163296, 0, -2091414496 } typeOffsets:intvector { -1820, 0, 0, 0, 0, 3600, 3600, 0 } - typeMap:bin { "010201020102010201020102010201020103010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" } + typeMap:bin { "0102010201020102010201020102010201030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + finalRule { "Morocco" } + finalRaw:int { 0 } + finalYear:int { 2040 } } //Z#19 /* Africa/Ceuta */ :table { transPre32:intvector { -1, 2117515772 } @@ -135,9 +138,13 @@ zoneinfo64:table(nofallback) { typeMap:bin { "01" } } //Z#25 /* Africa/El_Aaiun */ :table { - trans:intvector { -1136070432, 198291600 } - typeOffsets:intvector { -3168, 0, -3600, 0, 0, 0 } - typeMap:bin { "0102" } + trans:intvector { -1136070432, 198291600, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1404007200, 1406599200, 1414288800, 1427594400, 1434592800, 1437184800, 1445738400, 1459044000, 1465264800, 1467856800, 1477792800, 1490493600, 1495850400, 1498442400, 1509242400, 1521943200, 1526436000, 1529028000, 1540692000, 1553997600, 1557108000, 1559700000, 1572141600, 1585447200, 1587693600, 1590285600, 1603591200, 1616896800, 1618279200, 1620871200, 1635645600, 1648346400, 1648951200, 1651543200, 1667095200, 1682128800, 1698544800, 1712714400, 1729994400, 1743386400, 1761444000, 1774749600, 1792893600, 1806199200, 1824948000, 1837648800, 1856397600, 1869098400, 1887847200, 1901152800, 1919296800, 1932602400, 1950746400, 1964052000, 1982800800, 1995501600, 2014250400, 2026951200, 2045700000, 2058400800, 2077149600, 2090455200, 2108167200, 2121904800, 2138839200 } + transPost32:intvector { 0, -2141612896, 0, -2125542496, 0, -2122950496, 0, -2122864096, 0, -2110163296, 0, -2091414496 } + typeOffsets:intvector { -3168, 0, -3600, 0, 0, 0, 0, 3600 } + typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } + finalRule { "Morocco" } + finalRaw:int { 0 } + finalYear:int { 2040 } } //Z#26 /* Africa/Freetown */ :table { trans:intvector { -1785712020, -1091487600, -1080949200, -1059865200, -1049326800, -1028329200, -1017790800, -996793200, -986254800, -965257200, -954718800, -933634800, -923096400, -902098800, -891560400, -870562800, -860024400, -410223600, -397180800, -389235600, -365644800, -357699600, -334108800, -326163600, -302486400, -294541200, -270950400, -263005200, -239414400, -231469200 } @@ -286,10 +293,7 @@ zoneinfo64:table(nofallback) { /* Africa/Tripoli */ :table { trans:intvector { -1577926364, -574902000, -568087200, -512175600, -504928800, -449888400, -441856800, -347158800, 378684000, 386463600, 402271200, 417999600, 433807200, 449622000, 465429600, 481590000, 496965600, 512953200, 528674400, 544230000, 560037600, 575852400, 591660000, 607388400, 623196000, 641775600, 844034400, 860108400, 875916000, 1352505600, 1364515200, 1382659200 } typeOffsets:intvector { 3164, 0, 3600, 0, 3600, 3600, 7200, 0 } - typeMap:bin { "0102010201020103010201020102010201020102010201020103010203010201" } - finalRule { "Libya" } - finalRaw:int { 3600 } - finalYear:int { 2014 } + typeMap:bin { "0102010201020103010201020102010201020102010201020103010203010203" } links:intvector { 56, 520 } } //Z#56 /* Africa/Tunis */ :table { @@ -625,9 +629,9 @@ zoneinfo64:table(nofallback) { links:intvector { 112, 380 } } //Z#112 /* America/Eirunepe */ :table { - trans:intvector { -1767208832, -1206950400, -1191355200, -1175367600, -1159819200, -633812400, -622062000, -602276400, -591825600, -570740400, -560203200, -539118000, -531345600, -191358000, -184190400, -155156400, -150062400, -128890800, -121118400, -99946800, -89582400, -68410800, -57960000, 499755600, 511243200, 530600400, 540273600, 562136400, 571204800, 750834000, 761716800, 1214283600 } + trans:intvector { -1767208832, -1206950400, -1191355200, -1175367600, -1159819200, -633812400, -622062000, -602276400, -591825600, -570740400, -560203200, -539118000, -531345600, -191358000, -184190400, -155156400, -150062400, -128890800, -121118400, -99946800, -89582400, -68410800, -57960000, 499755600, 511243200, 530600400, 540273600, 562136400, 571204800, 750834000, 761716800, 1214283600, 1384056000 } typeOffsets:intvector { -16768, 0, -18000, 0, -18000, 3600, -14400, 0 } - typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020103" } + typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010301" } } //Z#113 /* America/El_Salvador */ :table { trans:intvector { -1546279392, 547020000, 559717200, 578469600, 591166800 } @@ -1152,9 +1156,9 @@ zoneinfo64:table(nofallback) { finalYear:int { 2008 } } //Z#193 /* America/Rio_Branco */ :table { - trans:intvector { -1767209328, -1206950400, -1191355200, -1175367600, -1159819200, -633812400, -622062000, -602276400, -591825600, -570740400, -560203200, -539118000, -531345600, -191358000, -184190400, -155156400, -150062400, -128890800, -121118400, -99946800, -89582400, -68410800, -57960000, 499755600, 511243200, 530600400, 540273600, 562136400, 571204800, 1214283600 } + trans:intvector { -1767209328, -1206950400, -1191355200, -1175367600, -1159819200, -633812400, -622062000, -602276400, -591825600, -570740400, -560203200, -539118000, -531345600, -191358000, -184190400, -155156400, -150062400, -128890800, -121118400, -99946800, -89582400, -68410800, -57960000, 499755600, 511243200, 530600400, 540273600, 562136400, 571204800, 1214283600, 1384056000 } typeOffsets:intvector { -16272, 0, -18000, 0, -18000, 3600, -14400, 0 } - typeMap:bin { "010201020102010201020102010201020102010201020102010201020103" } + typeMap:bin { "01020102010201020102010201020102010201020102010201020102010301" } links:intvector { 186, 194, 366 } } //Z#194 /* America/Rosario */ :int { 67 } //Z#195 @@ -3286,11 +3290,11 @@ zoneinfo64:table(nofallback) { Lebanon:intvector { 2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600 } //_#17 - Libya:intvector { - 2, -31, -6, 3600, 0, 9, -31, -6, 7200, 0, 3600 - } //_#18 Mexico:intvector { 3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600 + } //_#18 + Morocco:intvector { + 2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600 } //_#19 NZ:intvector { 8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600 @@ -3499,7 +3503,7 @@ zoneinfo64:table(nofallback) { "CA", //Z#166 America/Moncton "MX", //Z#167 America/Monterrey "UY", //Z#168 America/Montevideo - "001",//Z#169 America/Montreal + "CA", //Z#169 America/Montreal "MS", //Z#170 America/Montserrat "BS", //Z#171 America/Nassau "US", //Z#172 America/New_York -- 2.40.0