summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-02-04 16:55:10 +0000
committerNeil Fuller <nfuller@google.com>2015-02-04 17:48:44 +0000
commitdcd27b053b7d59af28bdabdc991e8e98e4d55e68 (patch)
tree42a62ca30b2a367112f931349fb897d06e8fc4ef
parent9a74b1c87c877728998408ce7b41fc4eaacc265c (diff)
downloadicu-lollipop-mr1-wfc-release.tar.gz
Files taken from: http://bugs.icu-project.org/trac/changeset/37006 The tzdata rules used are 2015a. No effort has been made to maintain the icu tests: this is just a data update. zoneinfo64.txt and icudt53l.dat updated with: cd external/icu mkdir build cd build ../icu4c/source/runConfigureICU Linux cd tools/tzcode/ cp ~/Downloads/tzdata2015a.tar.gz . mkdir ../../bin ln -S . ../../../icu4c/source/tools/tzcode/icuregions ln -S . ../../../icu4c/source/tools/tzcode/icuzones make cp zoneinfo64.txt ../../../icu4c/source/data/misc/zoneinfo64.txt cd ../.. make -j32 all cp data/out/tmp/icudt53l.dat ../icu4c/source/stubdata/ Bug: 19212588 Change-Id: I498842f3681dc5ae7bf968b814dadfd7d6b22dae
-rw-r--r--icu4c/source/data/misc/metaZones.txt7
-rw-r--r--icu4c/source/data/misc/windowsZones.txt10
-rw-r--r--icu4c/source/data/misc/zoneinfo64.txt2
-rw-r--r--icu4c/source/stubdata/icudt53l.datbin18724224 -> 18724224 bytes
4 files changed, 13 insertions, 6 deletions
diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt
index 47ee0276c..a65629f99 100644
--- a/icu4c/source/data/misc/metaZones.txt
+++ b/icu4c/source/data/misc/metaZones.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2014 International Business Machines
+// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/metaZones.xml
@@ -1412,6 +1412,11 @@ metaZones:table(nofallback){
{
"America_Central",
"1998-08-02 06:00",
+ "2015-02-01 08:00",
+ }
+ {
+ "America_Eastern",
+ "2015-02-01 08:00",
"9999-12-31 23:59",
}
}
diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt
index 4a9b9f211..8706eac83 100644
--- a/icu4c/source/data/misc/windowsZones.txt
+++ b/icu4c/source/data/misc/windowsZones.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2014 International Business Machines
+// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/windowsZones.xml
@@ -145,6 +145,7 @@ windowsZones:table(nofallback){
AU{"Antarctica/Macquarie"}
FM{"Pacific/Ponape Pacific/Kosrae"}
NC{"Pacific/Noumea"}
+ PG{"Pacific/Bougainville"}
SB{"Pacific/Guadalcanal"}
VU{"Pacific/Efate"}
ZZ{"Etc/GMT-11"}
@@ -152,8 +153,8 @@ windowsZones:table(nofallback){
"Central Standard Time (Mexico)"{
001{"America/Mexico_City"}
MX{
- "America/Mexico_City America/Bahia_Banderas America/Cancun America/Me"
- "rida America/Monterrey"
+ "America/Mexico_City America/Bahia_Banderas America/Merida America/Mo"
+ "nterrey"
}
}
"Central Standard Time"{
@@ -467,6 +468,7 @@ windowsZones:table(nofallback){
EC{"America/Guayaquil"}
JM{"America/Jamaica"}
KY{"America/Cayman"}
+ MX{"America/Cancun"}
PA{"America/Panama"}
PE{"America/Lima"}
ZZ{"Etc/GMT+5"}
@@ -686,7 +688,7 @@ windowsZones:table(nofallback){
FM{"Pacific/Truk"}
GU{"Pacific/Guam"}
MP{"Pacific/Saipan"}
- PG{"Pacific/Port_Moresby Pacific/Bougainville"}
+ PG{"Pacific/Port_Moresby"}
ZZ{"Etc/GMT-10"}
}
"Yakutsk Standard Time"{
diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt
index ba6c1f823..cd5176416 100644
--- a/icu4c/source/data/misc/zoneinfo64.txt
+++ b/icu4c/source/data/misc/zoneinfo64.txt
@@ -3,7 +3,7 @@
// Corporation and others. All Rights Reserved.
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Tue Feb 3 15:48:08 2015
+// Build date: Wed Feb 4 16:59:51 2015
// Olson source: ftp://elsie.nci.nih.gov/pub/
// Olson version: 2015a
// ICU version: 53.1.0.1
diff --git a/icu4c/source/stubdata/icudt53l.dat b/icu4c/source/stubdata/icudt53l.dat
index bbd196542..ee8010ea1 100644
--- a/icu4c/source/stubdata/icudt53l.dat
+++ b/icu4c/source/stubdata/icudt53l.dat
Binary files differ