Merge "Update ICU timezone data to 2014c"
diff --git a/data/misc/zoneinfo64.txt b/data/misc/zoneinfo64.txt
index 3e72cff..ad65bc7 100644
--- a/data/misc/zoneinfo64.txt
+++ b/data/misc/zoneinfo64.txt
@@ -3,17 +3,17 @@
// Corporation and others. All Rights Reserved.
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Wed Mar 26 03:10:59 2014
+// Build date: Mon May 19 11:32:58 2014
// Olson source: ftp://elsie.nci.nih.gov/pub/
-// Olson version: 2014b
-// ICU version: 53.1
+// Olson version: 2014c
+// ICU version: 53.1.0.1
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
// >> !!! >>> DO NOT EDIT <<< !!! <<
//---------------------------------------------------------
zoneinfo64:table(nofallback) {
- TZVersion { "2014b" }
+ TZVersion { "2014c" }
Zones:array {
/* ACT */ :int { 345 } //Z#0
/* AET */ :int { 357 } //Z#1
@@ -89,9 +89,12 @@
} //Z#17
/* Africa/Cairo */ :table {
transPre32:intvector { -1, 2109558187 }
- trans:intvector { -929844000, -923108400, -906170400, -892868400, -875844000, -857790000, -844308000, -825822000, -812685600, -794199600, -779853600, -762663600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -71107200, -52707600, -39484800, -21171600, -7948800, 10364400, 23587200, 41900400, 55123200, 73522800, 86745600, 105058800, 118281600, 136594800, 149817600, 168130800, 181353600, 199753200, 212976000, 231289200, 244512000, 262825200, 276048000, 294361200, 307584000, 325983600, 339206400, 357519600, 370742400, 396399600, 402278400, 426812400, 433814400, 452214000, 465436800, 483750000, 496972800, 515286000, 528508800, 546822000, 560044800, 578444400, 591667200, 610412400, 623203200, 641516400, 654739200, 673052400, 686275200, 704674800, 717897600, 736210800, 749433600, 767746800, 780969600, 799020000, 812322000, 830469600, 843771600, 861919200, 875221200, 893368800, 906670800, 925423200, 938725200, 956872800, 970174800, 988322400, 1001624400, 1019772000, 1033074000, 1051221600, 1064523600, 1083276000, 1096578000, 1114725600, 1128027600, 1146175200, 1158872400, 1177624800, 1189112400, 1209074400, 1219957200, 1240524000, 1250802000, 1272578400, 1281474000, 1284069600, 1285880400 }
+ trans:intvector { -929844000, -923108400, -906170400, -892868400, -875844000, -857790000, -844308000, -825822000, -812685600, -794199600, -779853600, -762663600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -71107200, -52707600, -39484800, -21171600, -7948800, 10364400, 23587200, 41900400, 55123200, 73522800, 86745600, 105058800, 118281600, 136594800, 149817600, 168130800, 181353600, 199753200, 212976000, 231289200, 244512000, 262825200, 276048000, 294361200, 307584000, 325983600, 339206400, 357519600, 370742400, 396399600, 402278400, 426812400, 433814400, 452214000, 465436800, 483750000, 496972800, 515286000, 528508800, 546822000, 560044800, 578444400, 591667200, 610412400, 623203200, 641516400, 654739200, 673052400, 686275200, 704674800, 717897600, 736210800, 749433600, 767746800, 780969600, 799020000, 812322000, 830469600, 843771600, 861919200, 875221200, 893368800, 906670800, 925423200, 938725200, 956872800, 970174800, 988322400, 1001624400, 1019772000, 1033074000, 1051221600, 1064523600, 1083276000, 1096578000, 1114725600, 1128027600, 1146175200, 1158872400, 1177624800, 1189112400, 1209074400, 1219957200, 1240524000, 1250802000, 1272578400, 1281474000, 1284069600, 1285880400, 1400191200, 1403992800, 1406584800, 1411678800, 1429826400, 1434578400, 1437170400, 1443128400, 1461880800, 1465250400, 1467842400, 1475182800, 1493330400, 1495836000, 1498428000, 1506632400, 1524780000, 1526421600, 1529013600, 1538082000, 1556229600, 1557093600, 1559685600, 1569531600, 1590271200, 1600981200, 1620856800, 1633035600, 1651528800, 1664485200, 1682632800, 1695934800 }
typeOffsets:intvector { 7509, 0, 7200, 0, 7200, 3600 }
- typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ finalRule { "Egypt" }
+ finalRaw:int { 7200 }
+ finalYear:int { 2024 }
links:intvector { 3, 18, 391 }
} //Z#18
/* Africa/Casablanca */ :table {
@@ -3263,66 +3266,69 @@
EUAsia:intvector {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 3600
} //_#13
+ Egypt:intvector {
+ 3, -30, -6, 0, 1, 8, -30, -5, 82800, 1, 3600
+ } //_#14
Fiji:intvector {
9, 21, -1, 7200, 0, 0, 18, -1, 7200, 0, 3600
- } //_#14
+ } //_#15
Haiti:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#15
+ } //_#16
Jordan:intvector {
2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600
- } //_#16
+ } //_#17
LH:intvector {
9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800
- } //_#17
+ } //_#18
Lebanon:intvector {
2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600
- } //_#18
+ } //_#19
Mexico:intvector {
3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#19
+ } //_#20
Morocco:intvector {
2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
- } //_#20
+ } //_#21
NZ:intvector {
8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600
- } //_#21
+ } //_#22
Namibia:intvector {
8, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 3600
- } //_#22
+ } //_#23
Palestine:intvector {
2, -31, -5, 86400, 0, 8, 21, -6, 0, 0, 3600
- } //_#23
+ } //_#24
Para:intvector {
9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600
- } //_#24
+ } //_#25
Syria:intvector {
2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600
- } //_#25
+ } //_#26
SystemV:intvector {
3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#26
+ } //_#27
TC:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#27
+ } //_#28
Thule:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#28
+ } //_#29
Troll:intvector {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200
- } //_#29
+ } //_#30
US:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#30
+ } //_#31
Uruguay:intvector {
9, 1, -1, 7200, 0, 2, 8, -1, 7200, 0, 3600
- } //_#31
+ } //_#32
WS:intvector {
8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600
- } //_#32
+ } //_#33
Zion:intvector {
2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#33
+ } //_#34
}
Regions:array {
"AU", //Z#0 ACT
@@ -3494,7 +3500,7 @@
"CA", //Z#166 America/Moncton
"MX", //Z#167 America/Monterrey
"UY", //Z#168 America/Montevideo
- "CA", //Z#169 America/Montreal
+ "001",//Z#169 America/Montreal
"MS", //Z#170 America/Montserrat
"BS", //Z#171 America/Nassau
"US", //Z#172 America/New_York
diff --git a/stubdata/icudt53l.dat b/stubdata/icudt53l.dat
index 7fbd886..db17003 100644
--- a/stubdata/icudt53l.dat
+++ b/stubdata/icudt53l.dat
Binary files differ
diff --git a/test/cintltst/ccaltst.c b/test/cintltst/ccaltst.c
index 79f69b8..7ab9ad6 100644
--- a/test/cintltst/ccaltst.c
+++ b/test/cintltst/ccaltst.c
@@ -2299,7 +2299,7 @@
static const TZTransitionItem tzTransitionItems[] = {
{ "USPacific mid 2012", zoneUSPacific, 2012, UCAL_JULY, 1, TRUE , TRUE },
{ "USPacific mid 100", zoneUSPacific, 100, UCAL_JULY, 1, FALSE, TRUE }, /* no transitions before 100 CE... */
- { "Cairo mid 2012", zoneCairo, 2012, UCAL_JULY, 1, TRUE , FALSE }, /* DST cancelled since 2011 */
+ // { "Cairo mid 2012", zoneCairo, 2012, UCAL_JULY, 1, TRUE , FALSE }, /* DST cancelled since 2011 */ // android-changed: disable for tzdata 2014c change to Egypt.
{ "Iceland mid 2012", zoneIceland, 2012, UCAL_JULY, 1, TRUE , FALSE }, /* always on DST */
{ NULL, NULL, 0, 0, 0, FALSE, FALSE } /* terminator */
};
