From 45c80ec7d71542372f2f1fe9f8feeed65f65f025 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Tue, 27 May 2008 16:51:03 +0000 Subject: [PATCH] ICU-5970 2008c into ICU4C trunk X-SVN-Rev: 23992 --- icu4c/source/data/misc/zoneinfo.txt | 20 ++++++++++---------- icu4c/source/test/intltest/tztest.cpp | 2 +- icu4c/source/tools/tzcode/icuzones | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/icu4c/source/data/misc/zoneinfo.txt b/icu4c/source/data/misc/zoneinfo.txt index 30ce1c3e52..ea1964ec71 100644 --- a/icu4c/source/data/misc/zoneinfo.txt +++ b/icu4c/source/data/misc/zoneinfo.txt @@ -3,17 +3,17 @@ // Corporation and others. All Rights Reserved. //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Tue Mar 25 14:30:03 2008 +// Build date: Tue May 27 11:55:54 2008 // Olson source: ftp://elsie.nci.nih.gov/pub/ -// Olson version: 2008b -// ICU version: 3.9.2 +// Olson version: 2008c +// ICU version: 4.0 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << //--------------------------------------------------------- zoneinfo:table(nofallback) { - TZVersion { "2008b" } + TZVersion { "2008c" } Zones:array { /* ACT */ :int { 328 } //Z#0 , /* AET */ :int { 340 } //Z#1 @@ -93,9 +93,9 @@ zoneinfo:table(nofallback) { :intvector { 3, 18, 374 } } //Z#18 , /* Africa/Casablanca */ :array { - :intvector { -2147483648, -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000 } + :intvector { -2147483648, -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000, 1212278400, 1222556400 } :intvector { -1820, 0, 0, 0, 0, 3600, 3600, 0 } - :bin { "0001020102010201020102010201020102010301" } + :bin { "00010201020102010201020102010201020103010201" } } //Z#19 , /* Africa/Ceuta */ :array { :intvector { -2147483648, -1630112400, -1616810400, -1442451600, -1427677200, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1293840000, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -1297,9 +1297,9 @@ zoneinfo:table(nofallback) { } //Z#235 , /* Asia/Calcutta */ :int { 262 } //Z#236 , /* Asia/Choibalsan */ :array { - :intvector { -2147483648, -2032933080, 252435600, 417974400, 433778400, 449593200, 465314400, 481042800, 496764000, 512492400, 528213600, 543942000, 559663200, 575391600, 591112800, 606841200, 622562400, 638290800, 654616800, 670345200, 686066400, 701794800, 717516000, 733244400, 748965600, 764694000, 780415200, 796143600, 811864800, 828198000, 843919200, 859647600, 875368800, 891097200, 906818400, 988390800, 1001692800, 1017421200, 1033142400, 1048870800, 1064592000, 1080320400, 1096041600, 1111770000, 1127491200, 1143219600, 1159545600 } + :intvector { -2147483648, -2032933080, 252435600, 417974400, 433778400, 449593200, 465314400, 481042800, 496764000, 512492400, 528213600, 543942000, 559663200, 575391600, 591112800, 606841200, 622562400, 638290800, 654616800, 670345200, 686066400, 701794800, 717516000, 733244400, 748965600, 764694000, 780415200, 796143600, 811864800, 828198000, 843919200, 859647600, 875368800, 891097200, 906818400, 988390800, 1001692800, 1017421200, 1033142400, 1048870800, 1064592000, 1080320400, 1096041600, 1111770000, 1127491200, 1143219600, 1159545600, 1206889200 } :intvector { 25200, 0, 27480, 0, 28800, 0, 32400, 0, 32400, 3600 } - :bin { "0100020403040304030403040304030403040304030403040304030403040304030403040304030403040304030403" } + :bin { "010002040304030403040304030403040304030403040304030403040304030403040304030403040304030403040302" } } //Z#237 , /* Asia/Chongqing */ :array { :intvector { -2147483648, -1325487980, 325962000, 515520000, 527007600, 545155200, 558457200, 576604800, 589906800, 608659200, 621961200, 640108800, 653410800, 671558400, 684860400 } @@ -1408,9 +1408,9 @@ zoneinfo:table(nofallback) { :intvector { 43200, 1997 } } //Z#258 , /* Asia/Karachi */ :array { - :intvector { -2147483648, -1988166492, -862637400, -764145000, -576135000, 38775600, 1018119660, 1033840860 } + :intvector { -2147483648, -1988166492, -862637400, -764145000, -576135000, 38775600, 1018119660, 1033840860, 1212260400, 1220205600 } :intvector { 16092, 0, 18000, 0, 18000, 3600, 19800, 0, 19800, 3600 } - :bin { "0003040301010201" } + :bin { "00030403010102010201" } :intvector { 259, 516 } } //Z#259 , /* Asia/Kashgar */ :array { diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 8ff80b4a5f..97c3f65c40 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -612,7 +612,7 @@ void TimeZoneTest::TestShortZoneIDs() {"EAT", 180, FALSE}, {"MET", 60, TRUE}, // updated 12/3/99 aliu {"NET", 240, TRUE}, // updated 12/3/99 aliu - {"PLT", 300, FALSE}, // updated Aug 2003 aliu + {"PLT", 300, TRUE}, // updated by 2008c {"IST", 330, FALSE}, {"BST", 360, FALSE}, {"VST", 420, FALSE}, diff --git a/icu4c/source/tools/tzcode/icuzones b/icu4c/source/tools/tzcode/icuzones index 528ea26bf9..24a2223e07 100644 --- a/icu4c/source/tools/tzcode/icuzones +++ b/icu4c/source/tools/tzcode/icuzones @@ -1,5 +1,5 @@ ###################################################################### -# Copyright (C) 2007, International Business Machines +# Copyright (C) 2007-2008, International Business Machines # Corporation and others. All Rights Reserved. ###################################################################### # This is an ICU-specific file with the same format as regular @@ -57,7 +57,7 @@ Link Europe/Paris ECT ####Link EST America/New_York EST # Defined as -05:00 ####Link Pacific/Honolulu HST # Defined as -10:00 Link America/Indiana/Indianapolis IET -Link Asia/Calcutta IST +Link Asia/Kolkata IST Link Asia/Tokyo JST #Link Asia/Tehran MET # MET is a standard UNIX zone Link Pacific/Apia MIT @@ -70,4 +70,4 @@ Link America/Puerto_Rico PRT Link America/Los_Angeles PST Link Pacific/Guadalcanal SST #Link Etc/UTC UTC # Olson LINK -Link Asia/Saigon VST +Link Asia/Ho_Chi_Minh VST