diff options
author | Neil Fuller <nfuller@google.com> | 2015-02-04 16:55:10 +0000 |
---|---|---|
committer | Neil Fuller <nfuller@google.com> | 2015-02-04 17:48:44 +0000 |
commit | dcd27b053b7d59af28bdabdc991e8e98e4d55e68 (patch) | |
tree | 42a62ca30b2a367112f931349fb897d06e8fc4ef | |
parent | 9a74b1c87c877728998408ce7b41fc4eaacc265c (diff) | |
download | icu-lollipop-mr1-wfc-release.tar.gz |
Update ICU metadata from 2014j to 2015aandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
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.txt | 7 | ||||
-rw-r--r-- | icu4c/source/data/misc/windowsZones.txt | 10 | ||||
-rw-r--r-- | icu4c/source/data/misc/zoneinfo64.txt | 2 | ||||
-rw-r--r-- | icu4c/source/stubdata/icudt53l.dat | bin | 18724224 -> 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 Binary files differindex bbd196542..ee8010ea1 100644 --- a/icu4c/source/stubdata/icudt53l.dat +++ b/icu4c/source/stubdata/icudt53l.dat |