summaryrefslogtreecommitdiffstats
path: root/icu4c
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-08-25 12:42:37 +0100
committerNeil Fuller <nfuller@google.com>2015-08-25 19:57:23 +0100
commit45d8f49c311fe7a3e2b0df31b85ad1a6d514ace5 (patch)
tree118ecdf4fd1a1148a2b8a58a242998b615ae9c3c /icu4c
parente3cb7f5f31a037950b8f833a32bd0e35b7e6613b (diff)
downloadandroid_external_icu-45d8f49c311fe7a3e2b0df31b85ad1a6d514ace5.tar.gz
android_external_icu-45d8f49c311fe7a3e2b0df31b85ad1a6d514ace5.tar.bz2
android_external_icu-45d8f49c311fe7a3e2b0df31b85ad1a6d514ace5.zip
Update timezone data to 2015f
Changes affecting future time stamps North Korea switches to +0830 on 2015-08-15. (Thanks to Steffen Thorsen.) The abbreviation remains "KST". (Thanks to Robert Elz.) Uruguay no longer observes DST. (Thanks to Steffen Thorsen and Pablo Camargo.) Changes affecting past and future time stamps Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC. (Thanks to Roman Tudos.) Contains metaZones.txt, windowsZones.txt modifications from ICU: http://bugs.icu-project.org/trac/changeset/37763 The zoneinfo64.txt changes are equivalent, excluding the change to Aftica/Asmera on line 3134 which is not required and was incorrect upstream (made during the 2015e update) and was not present on Android. Other files have been regenerated. Bug: 23480367 (cherry-picked from commit f41c44589dcffe68517e2b19a5a81f30b8ccc63f) Change-Id: I61fd47336e04fd49c2a07bf972808b3ce4e85a3d
Diffstat (limited to 'icu4c')
-rw-r--r--icu4c/source/data/misc/metaZones.txt2
-rw-r--r--icu4c/source/data/misc/windowsZones.txt1
-rw-r--r--icu4c/source/data/misc/zoneinfo64.txt47
-rw-r--r--icu4c/source/stubdata/icudt55l.datbin23067600 -> 23067664 bytes
4 files changed, 24 insertions, 26 deletions
diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt
index a65629f99..4a458d14f 100644
--- a/icu4c/source/data/misc/metaZones.txt
+++ b/icu4c/source/data/misc/metaZones.txt
@@ -3050,6 +3050,8 @@ metaZones:table(nofallback){
"Asia:Pyongyang"{
{
"Korea",
+ "1970-01-01 00:00",
+ "2015-08-14 15:00",
}
}
"Asia:Qatar"{
diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt
index daacdc2dd..061e3c4f7 100644
--- a/icu4c/source/data/misc/windowsZones.txt
+++ b/icu4c/source/data/misc/windowsZones.txt
@@ -322,7 +322,6 @@ windowsZones:table(nofallback){
}
"Korea Standard Time"{
001{"Asia/Seoul"}
- KP{"Asia/Pyongyang"}
KR{"Asia/Seoul"}
}
"Libya Standard Time"{
diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt
index b6cd9710e..5df83de64 100644
--- a/icu4c/source/data/misc/zoneinfo64.txt
+++ b/icu4c/source/data/misc/zoneinfo64.txt
@@ -3,9 +3,9 @@
// Corporation and others. All Rights Reserved.
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Tue Jun 30 16:20:10 2015
+// Build date: Tue Aug 25 12:33:39 2015
// tz database: ftp://ftp.iana.org/tz/
-// tz version: 2015e
+// tz version: 2015f
// ICU version: 55.1
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
@@ -13,7 +13,7 @@
//---------------------------------------------------------
zoneinfo64:table(nofallback) {
- TZVersion { "2015e" }
+ TZVersion { "2015f" }
Zones:array {
/* ACT */ :int { 347 } //Z#0
/* AET */ :int { 359 } //Z#1
@@ -827,12 +827,9 @@ zoneinfo64:table(nofallback) {
finalYear:int { 2003 }
} //Z#167
/* America/Montevideo */ :table {
- trans:intvector { -1567455316, -1459542600, -1443819600, -1428006600, -1412283600, -1396470600, -1380747600, -1141590600, -1128286800, -1110141000, -1096837200, -1078691400, -1065387600, -1046637000, -1033938000, -1015187400, -1002488400, -983737800, -971038800, -952288200, -938984400, -920838600, -907534800, -896819400, -883602000, -853619400, -845848800, -334789200, -319672800, -314226000, -309996000, -149720400, -134604000, -118270800, -100044000, -86821200, -68508000, -50446800, -34119000, -18910800, -2583000, 12625200, 28953000, 72932400, 82692000, 132116400, 156911400, 212983200, 250052400, 260244000, 307594800, 325994400, 566449200, 574308000, 597812400, 605671200, 625633200, 636516000, 656478000, 667965600, 688532400, 699415200, 719377200, 730864800, 1095562800, 1111896000, 1128834000, 1142136000, 1159678800, 1173585600, 1191733200 }
+ trans:intvector { -1567455316, -1459542600, -1443819600, -1428006600, -1412283600, -1396470600, -1380747600, -1141590600, -1128286800, -1110141000, -1096837200, -1078691400, -1065387600, -1046637000, -1033938000, -1015187400, -1002488400, -983737800, -971038800, -952288200, -938984400, -920838600, -907534800, -896819400, -883602000, -853619400, -845848800, -334789200, -319672800, -314226000, -309996000, -149720400, -134604000, -118270800, -100044000, -86821200, -68508000, -50446800, -34119000, -18910800, -2583000, 12625200, 28953000, 72932400, 82692000, 132116400, 156911400, 212983200, 250052400, 260244000, 307594800, 325994400, 566449200, 574308000, 597812400, 605671200, 625633200, 636516000, 656478000, 667965600, 688532400, 699415200, 719377200, 730864800, 1095562800, 1111896000, 1128834000, 1142136000, 1159678800, 1173585600, 1191733200, 1205035200, 1223182800, 1236484800, 1254632400, 1268539200, 1286082000, 1299988800, 1317531600, 1331438400, 1349586000, 1362888000, 1381035600, 1394337600, 1412485200, 1425787200 }
typeOffsets:intvector { -13484, 0, -12600, 0, -12600, 1800, -10800, 0, -10800, 1800, -10800, 3600 }
- typeMap:bin { "0102010201020102010201020102010201020102010201020105030503050305030503050304030403040305030405030503050305030503050305030503050305030503050305" }
- finalRule { "Uruguay" }
- finalRaw:int { -10800 }
- finalYear:int { 2008 }
+ typeMap:bin { "0102010201020102010201020102010201020102010201020105030503050305030503050304030403040305030405030503050305030503050305030503050305030503050305030503050305030503050305030503" }
} //Z#168
/* America/Montreal */ :int { 215 } //Z#169
/* America/Montserrat */ :int { 185 } //Z#170
@@ -1539,9 +1536,9 @@ zoneinfo64:table(nofallback) {
typeMap:bin { "02040203020301" }
} //Z#298
/* Asia/Pyongyang */ :table {
- trans:intvector { -1948782180, -1830414600 }
+ trans:intvector { -1948782180, -1830414600, 1439564400 }
typeOffsets:intvector { 30180, 0, 30600, 0, 32400, 0 }
- typeMap:bin { "0102" }
+ typeMap:bin { "010201" }
} //Z#299
/* Asia/Qatar */ :table {
trans:intvector { -1577935568, 76190400 }
@@ -2096,10 +2093,10 @@ zoneinfo64:table(nofallback) {
/* Europe/Busingen */ :int { 489 } //Z#441
/* Europe/Chisinau */ :table {
transPre32:intvector { -1, 1454819576 }
- trans:intvector { -1637114100, -1213148664, -1187056800, -1175479200, -1159754400, -1144029600, -1127700000, -1111975200, -1096250400, -1080525600, -1064800800, -1049076000, -1033351200, -1017626400, -1001901600, -986176800, -970452000, -954727200, -927165600, -898138800, -857257200, -844556400, -828226800, -812502000, -800157600, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 641941200, 670377600, 686102400, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859683600, 877827600 }
+ trans:intvector { -1637114100, -1213148664, -1187056800, -1175479200, -1159754400, -1144029600, -1127700000, -1111975200, -1096250400, -1080525600, -1064800800, -1049076000, -1033351200, -1017626400, -1001901600, -986176800, -970452000, -954727200, -927165600, -898138800, -857257200, -844556400, -828226800, -812502000, -800157600, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 641941200, 670377600, 686102400, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859680000, 877824000 }
typeOffsets:intvector { 6920, 0, 3600, 0, 3600, 3600, 6264, 0, 6900, 0, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 }
typeMap:bin { "0403050605060506050605060506050605060506020102010207080708070807080708070807080708070807050605060506050605060506050605" }
- finalRule { "EU" }
+ finalRule { "Moldova" }
finalRaw:int { 7200 }
finalYear:int { 1998 }
links:intvector { 442, 479 }
@@ -3080,41 +3077,41 @@ zoneinfo64:table(nofallback) {
Mexico:intvector {
3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
} //_#17
+ Moldova:intvector {
+ 2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
+ } //_#18
Mongol:intvector {
2, -31, -7, 7200, 0, 8, -30, -7, 0, 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, -6, 86400, 0, 9, 21, -6, 0, 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
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
- Uruguay:intvector {
- 9, 1, -1, 7200, 0, 2, 8, -1, 7200, 0, 3600
} //_#29
WS:intvector {
8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600
diff --git a/icu4c/source/stubdata/icudt55l.dat b/icu4c/source/stubdata/icudt55l.dat
index 2caf68800..be7b1cf26 100644
--- a/icu4c/source/stubdata/icudt55l.dat
+++ b/icu4c/source/stubdata/icudt55l.dat
Binary files differ