From 79d364903305830d4089377396465a834754b329 Mon Sep 17 00:00:00 2001 From: Kevin B Kenny Date: Tue, 2 Nov 2004 15:16:35 +0000 Subject: updates to Havana and Cuiaba time zones --- ChangeLog | 9 +++++++++ library/tzdata/America/Cuiaba | 2 +- library/tzdata/America/Havana | 1 - tools/tclZIC.tcl | 10 +++++----- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63e3a2b..14add0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-11-02 Kevin Kenny + + * library/tzdata/America/Cuiaba: Change to DST rules for + * library/tzdata/America/Havana: autumn of 2004. + [ftp://elsie.nci.nih.gov/pub/tzdata2004g.tar.gz] + + * tools/tclZIC.tcl: Updated to be compatible with recent + changes in library/clock.tcl. + 2004-11-02 Vince Darley * win/tclWinFile.c: Simplify TclpUtime to use Tcl_FSGetNativePath, diff --git a/library/tzdata/America/Cuiaba b/library/tzdata/America/Cuiaba index 08edaa4..ce667ba 100644 --- a/library/tzdata/America/Cuiaba +++ b/library/tzdata/America/Cuiaba @@ -62,7 +62,7 @@ set TZData(:America/Cuiaba) { {1036296000 -10800 1 AMST} {1045364400 -14400 0 AMT} {1064372400 -14400 0 AMT} - {1096862400 -14400 0 AMT} + {1096603200 -14400 0 AMT} {1099368000 -10800 1 AMST} {1108868400 -14400 0 AMT} {1129435200 -10800 1 AMST} diff --git a/library/tzdata/America/Havana b/library/tzdata/America/Havana index cc8939e..888afff 100644 --- a/library/tzdata/America/Havana +++ b/library/tzdata/America/Havana @@ -95,7 +95,6 @@ set TZData(:America/Havana) { {1049587200 -14400 1 CDT} {1067126400 -18000 0 CST} {1081036800 -14400 1 CDT} - {1099180800 -18000 0 CST} {1112486400 -14400 1 CDT} {1130630400 -18000 0 CST} {1143936000 -14400 1 CDT} diff --git a/tools/tclZIC.tcl b/tools/tclZIC.tcl index 9ad1dd3..524eb74 100755 --- a/tools/tclZIC.tcl +++ b/tools/tclZIC.tcl @@ -29,7 +29,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tclZIC.tcl,v 1.2 2004/09/07 17:38:59 kennykb Exp $ +# RCS: @(#) $Id: tclZIC.tcl,v 1.3 2004/11/02 15:16:38 kennykb Exp $ # #---------------------------------------------------------------------- @@ -963,7 +963,7 @@ proc applyRules { ruleSet year startSecs stdGMTOffset DSTOffset nextGMTOffset \ set untilJCD [eval $untilDaySpec] set untilBaseSecs [expr { wide(86400) * wide($untilJCD) - - $::tcl::clock::PosixEpochAsJulianSeconds }] + - 210866803200 }] set untilSecs [eval [linsert $untilTimeOfDay 0 convertTimeOfDay \ $untilBaseSecs $stdGMTOffset $DSTOffset]] } @@ -1048,7 +1048,7 @@ proc applyRules { ruleSet year startSecs stdGMTOffset DSTOffset nextGMTOffset \ set date [::tcl::clock::GetJulianDayFromEraYearMonthDay \ [dict create era CE year $year month 1 dayOfMonth 1]] set startSecs [expr { [dict get $date julianDay] * wide(86400) \ - - $::tcl::clock::PosixEpochAsJulianSeconds }] + -210866803200 }] set startSecs [expr { $startSecs - $stdGMTOffset - $DSTOffset }] @@ -1145,7 +1145,7 @@ proc findEarliestRule { remainingRules year stdGMTOffset DSTOffset } { set dayIn [eval $daySpecOn] set secs [expr { wide(86400) * wide($dayIn) - - $::tcl::clock::PosixEpochAsJulianSeconds }] + -210866803200 }] set secs [eval [linsert $timeAt 0 convertTimeOfDay \ $secs $stdGMTOffset $DSTOffset]] if { $secs < $earliest } { @@ -1275,7 +1275,7 @@ proc processTimeZone { zoneName zoneData } { set startDay [eval $dayRule] set secs [expr { wide(86400) * wide($startDay) - - $::tcl::clock::PosixEpochAsJulianSeconds}] + -210866803200}] set secs [eval [linsert $timeOfDay 0 convertTimeOfDay \ $secs $stdGMTOffset $DSTOffset]] } -- cgit v0.12