summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2011-03-14 21:32:26 (GMT)
committerKevin B Kenny <kennykb@acm.org>2011-03-14 21:32:26 (GMT)
commit8de1e1fbccf76d8a4a83722faaac940f23cd299c (patch)
tree0ad50bf10d44feb58fd93d467470a2542274812f
parentd3cdcae534ac36ff105d99cab68e7c6328bd63f2 (diff)
downloadtcl-8de1e1fbccf76d8a4a83722faaac940f23cd299c.zip
tcl-8de1e1fbccf76d8a4a83722faaac940f23cd299c.tar.gz
tcl-8de1e1fbccf76d8a4a83722faaac940f23cd299c.tar.bz2
Import Olson's tzdata2011d and fix a tclZIC.tcl bug that made the import fail.
* tools/tclZIC.tcl (onDayOfMonth): Allow for leading zeroes in month and day so that tzdata2011d parses correctly. * library/tzdata/America/Havana: * library/tzdata/America/Juneau: * library/tzdata/America/Santiago: * library/tzdata/Europe/Istanbul: * library/tzdata/Pacific/Apia: * library/tzdata/Pacific/Easter: * library/tzdata/Pacific/Honolulu: tzdata2011d
-rw-r--r--ChangeLog12
-rw-r--r--library/tzdata/America/Havana2
-rw-r--r--library/tzdata/America/Juneau5
-rw-r--r--library/tzdata/America/Santiago2
-rw-r--r--library/tzdata/Europe/Istanbul3
-rw-r--r--library/tzdata/Pacific/Apia2
-rw-r--r--library/tzdata/Pacific/Easter2
-rw-r--r--library/tzdata/Pacific/Honolulu8
-rwxr-xr-xtools/tclZIC.tcl3
9 files changed, 27 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index cd908d6..4bc4c62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-03-14 Kevin B. Kenny <kennykb@acm.org>
+
+ * tools/tclZIC.tcl (onDayOfMonth): Allow for leading zeroes
+ in month and day so that tzdata2011d parses correctly.
+ * library/tzdata/America/Havana:
+ * library/tzdata/America/Juneau:
+ * library/tzdata/America/Santiago:
+ * library/tzdata/Europe/Istanbul:
+ * library/tzdata/Pacific/Apia:
+ * library/tzdata/Pacific/Easter:
+ * library/tzdata/Pacific/Honolulu: tzdata2011d
+
2011-03-10 Jan Nijtmans <nijtmans@users.sf.net>
* unix/configure.in [Bug 3205320]: stack space detection defeated by inlining
diff --git a/library/tzdata/America/Havana b/library/tzdata/America/Havana
index 7fc6305..f37b98e 100644
--- a/library/tzdata/America/Havana
+++ b/library/tzdata/America/Havana
@@ -104,7 +104,7 @@ set TZData(:America/Havana) {
{1256446800 -18000 0 CST}
{1268542800 -14400 1 CDT}
{1288501200 -18000 0 CST}
- {1299992400 -14400 1 CDT}
+ {1300597200 -14400 1 CDT}
{1319950800 -18000 0 CST}
{1331442000 -14400 1 CDT}
{1351400400 -18000 0 CST}
diff --git a/library/tzdata/America/Juneau b/library/tzdata/America/Juneau
index 88fe0ce..fead810 100644
--- a/library/tzdata/America/Juneau
+++ b/library/tzdata/America/Juneau
@@ -32,8 +32,9 @@ set TZData(:America/Juneau) {
{278499600 -28800 0 PST}
{294228000 -25200 1 PDT}
{309949200 -28800 0 PST}
- {325677600 -25200 1 PDT}
- {341398800 -28800 0 PST}
+ {325677600 -32400 0 YST}
+ {325681200 -28800 1 YDT}
+ {341406000 -28800 0 PST}
{357127200 -25200 1 PDT}
{372848400 -28800 0 PST}
{388576800 -25200 1 PDT}
diff --git a/library/tzdata/America/Santiago b/library/tzdata/America/Santiago
index a3cd817..3d96787 100644
--- a/library/tzdata/America/Santiago
+++ b/library/tzdata/America/Santiago
@@ -110,7 +110,7 @@ set TZData(:America/Santiago) {
{1255233600 -10800 1 CLST}
{1270350000 -14400 0 CLT}
{1286683200 -10800 1 CLST}
- {1299985200 -14400 0 CLT}
+ {1301799600 -14400 0 CLT}
{1318132800 -10800 1 CLST}
{1331434800 -14400 0 CLT}
{1350187200 -10800 1 CLST}
diff --git a/library/tzdata/Europe/Istanbul b/library/tzdata/Europe/Istanbul
index 06b2f88..7737d75 100644
--- a/library/tzdata/Europe/Istanbul
+++ b/library/tzdata/Europe/Istanbul
@@ -122,7 +122,8 @@ set TZData(:Europe/Istanbul) {
{1256432400 7200 0 EET}
{1269738000 10800 1 EEST}
{1288486800 7200 0 EET}
- {1301187600 10800 1 EEST}
+ {1301187600 7200 0 EET}
+ {1301274000 10800 0 EEST}
{1319936400 7200 0 EET}
{1332637200 10800 1 EEST}
{1351386000 7200 0 EET}
diff --git a/library/tzdata/Pacific/Apia b/library/tzdata/Pacific/Apia
index 2db52b6..25b047d 100644
--- a/library/tzdata/Pacific/Apia
+++ b/library/tzdata/Pacific/Apia
@@ -6,5 +6,5 @@ set TZData(:Pacific/Apia) {
{-1861878784 -41400 0 SAMT}
{-631110600 -39600 0 WST}
{1285498800 -36000 1 WSDT}
- {1301828400 -39600 0 WST}
+ {1301752800 -39600 0 WST}
}
diff --git a/library/tzdata/Pacific/Easter b/library/tzdata/Pacific/Easter
index be661fc..8a18e64 100644
--- a/library/tzdata/Pacific/Easter
+++ b/library/tzdata/Pacific/Easter
@@ -94,7 +94,7 @@ set TZData(:Pacific/Easter) {
{1255233600 -18000 1 EASST}
{1270350000 -21600 0 EAST}
{1286683200 -18000 1 EASST}
- {1299985200 -21600 0 EAST}
+ {1301799600 -21600 0 EAST}
{1318132800 -18000 1 EASST}
{1331434800 -21600 0 EAST}
{1350187200 -18000 1 EASST}
diff --git a/library/tzdata/Pacific/Honolulu b/library/tzdata/Pacific/Honolulu
index f441a02..e24b096 100644
--- a/library/tzdata/Pacific/Honolulu
+++ b/library/tzdata/Pacific/Honolulu
@@ -2,11 +2,9 @@
set TZData(:Pacific/Honolulu) {
{-9223372036854775808 -37886 0 LMT}
- {-2208907714 -37800 0 HST}
+ {-2334101314 -37800 0 HST}
{-1157283000 -34200 1 HDT}
- {-1155472200 -34200 0 HST}
- {-880201800 -34200 1 HWT}
- {-769395600 -34200 1 HPT}
- {-765376200 -37800 0 HST}
+ {-1155436200 -37800 0 HST}
+ {-880198200 -34200 1 HDT}
{-712150200 -36000 0 HST}
}
diff --git a/tools/tclZIC.tcl b/tools/tclZIC.tcl
index 6169696..1b19d82 100755
--- a/tools/tclZIC.tcl
+++ b/tools/tclZIC.tcl
@@ -394,6 +394,9 @@ proc parseON {on} {
#----------------------------------------------------------------------
proc onDayOfMonth {day year month} {
+ scan $day %d day
+ scan $year %d year
+ scan $month %d month
set date [::tcl::clock::GetJulianDayFromEraYearMonthDay \
[dict create era CE year $year month $month dayOfMonth $day] \
2361222]