* NEWS: Document this. * australasia (Pacific/Guam): Now a link to Pacific/Guam. (Pacific/Midway): Now a link to Pacific/Pago_Pago. * backzone (America/Antigua, America/Cayman, Pacific/Miday) (Pacific/Saipan): Move these four entries here from the other files. * checktab.awk: Remove special cases for the four zones. * northamerica (America/Cayman): Now a link to America/Panama. (America/Antigua): Move to ... * southamerica (America/Antigua): ... here, and make it a link to America/Port_of_Spain. --- NEWS | 9 +++++++++ australasia | 27 ++++----------------------- backzone | 36 ++++++++++++++++++++++++++++++++++++ checktab.awk | 9 --------- northamerica | 12 ++---------- southamerica | 1 + 6 files changed, 52 insertions(+), 42 deletions(-) diff --git a/NEWS b/NEWS index b70ce73..33e983f 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,15 @@ News for the tz database Unreleased, experimental changes + Changes affecting past time stamps + + Some more zones have been turned into links, when they differed + from existing zones only for older time stamps. As usual, + these changes affect UTC offsets in pre-1970 time stamps only. + Their old contents have been moved to the 'backzone' file. + The affected zones are: America/Antigua, America/Cayman, + Pacific/Midway, and Pacific/Saipan. + Changes affecting commentary Cite the recent Mexican decree changing Quintana Roo's time zone. diff --git a/australasia b/australasia index 911e681..3e2c0b3 100644 --- a/australasia +++ b/australasia @@ -373,6 +373,7 @@ Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31 9:39:00 - LMT 1901 # Agana 10:00 - GST 2000 Dec 23 # Guam 10:00 - ChST # Chamorro Standard Time +Link Pacific/Guam Pacific/Saipan # N Mariana Is # Kiribati # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -388,12 +389,7 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901 14:00 - LINT # N Mariana Is -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Saipan -14:17:00 - LMT 1844 Dec 31 - 9:43:00 - LMT 1901 - 9:00 - MPT 1969 Oct # N Mariana Is Time - 10:00 - MPT 2000 Dec 23 - 10:00 - ChST # Chamorro Standard Time +# See Pacific/Guam. # Marshall Is # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -563,6 +559,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5 -11:00 - NST 1967 Apr # N=Nome -11:00 - BST 1983 Nov 30 # B=Bering -11:00 - SST # S=Samoa +Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands # Samoa (formerly and also known as Western Samoa) @@ -744,23 +741,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901 # uninhabited # Midway -# -# From Mark Brader (2005-01-23): -# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies, -# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3] -# reproduced a Pan American Airways timetable from 1936, for their weekly -# "Orient Express" flights between San Francisco and Manila, and connecting -# flights to Chicago and the US East Coast. As it uses some time zone -# designations that I've never seen before:.... -# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I. H.L.T. Ar. 5:30P Sun. -# " 3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A " -# -Zone Pacific/Midway -11:49:28 - LMT 1901 - -11:00 - NST 1956 Jun 3 - -11:00 1:00 NDT 1956 Sep 2 - -11:00 - NST 1967 Apr # N=Nome - -11:00 - BST 1983 Nov 30 # B=Bering - -11:00 - SST # S=Samoa +# See Pacific/Pago_Pago. # Palmyra # uninhabited since World War II; was probably like Pacific/Kiritimati diff --git a/backzone b/backzone index fc20ea5..31a3f5a 100644 --- a/backzone +++ b/backzone @@ -255,6 +255,11 @@ Zone Africa/Timbuktu -0:12:04 - LMT 1912 Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2 -4:00 - AST +# Antigua and Barbuda +Zone America/Antigua -4:07:12 - LMT 1912 Mar 2 + -5:00 - EST 1951 + -4:00 - AST + # Chubut, Argentina # The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit. Zone America/Argentina/ComodRivadavia -4:30:00 - LMT 1894 Oct 31 @@ -274,6 +279,11 @@ Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad -4:30 - ANT 1965 # Netherlands Antilles Time -4:00 - AST +# Cayman Is +Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown + -5:07:11 - KMT 1912 Feb # Kingston Mean Time + -5:00 - EST + # Canada Zone America/Coral_Harbour -5:32:40 - LMT 1884 -5:00 NT_YK E%sT 1946 @@ -599,3 +609,29 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou # US minor outlying islands Zone Pacific/Johnston -10:00 - HST + +# US minor outlying islands +# +# From Mark Brader (2005-01-23): +# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies, +# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3] +# reproduced a Pan American Airways timetable from 1936, for their weekly +# "Orient Express" flights between San Francisco and Manila, and connecting +# flights to Chicago and the US East Coast. As it uses some time zone +# designations that I've never seen before:.... +# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I. H.L.T. Ar. 5:30P Sun. +# " 3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A " +# +Zone Pacific/Midway -11:49:28 - LMT 1901 + -11:00 - NST 1956 Jun 3 + -11:00 1:00 NDT 1956 Sep 2 + -11:00 - NST 1967 Apr # N=Nome + -11:00 - BST 1983 Nov 30 # B=Bering + -11:00 - SST # S=Samoa + +# N Mariana Is +Zone Pacific/Saipan -14:17:00 - LMT 1844 Dec 31 + 9:43:00 - LMT 1901 + 9:00 - MPT 1969 Oct # N Mariana Is Time + 10:00 - MPT 2000 Dec 23 + 10:00 - ChST # Chamorro Standard Time diff --git a/checktab.awk b/checktab.awk index 9a452b6..cf2c726 100644 --- a/checktab.awk +++ b/checktab.awk @@ -12,15 +12,6 @@ BEGIN { # A special (and we hope temporary) case. tztab["America/Montreal"] = 1 - # Some more special cases; these are zones that should probably - # be turned into links. - if (zone_table == "zone1970.tab") { - tztab["America/Antigua"] = 1 - tztab["America/Cayman"] = 1 - tztab["Pacific/Midway"] = 1 - tztab["Pacific/Saipan"] = 1 - } - while (getline <iso_table) { iso_NR++ if ($0 ~ /^#/) continue diff --git a/northamerica b/northamerica index ad7e106..cb27bd5 100644 --- a/northamerica +++ b/northamerica @@ -2524,13 +2524,8 @@ Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32 ############################################################################### # Anguilla -# See America/Port_of_Spain. - # Antigua and Barbuda -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone America/Antigua -4:07:12 - LMT 1912 Mar 2 - -5:00 - EST 1951 - -4:00 - AST +# See America/Port_of_Spain. # Bahamas # @@ -2597,10 +2592,7 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton -4:00 US A%sT # Cayman Is -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown - -5:07:11 - KMT 1912 Feb # Kingston Mean Time - -5:00 - EST +Link America/Panama America/Cayman # Costa Rica diff --git a/southamerica b/southamerica index a64a438..fc0cc54 100644 --- a/southamerica +++ b/southamerica @@ -1604,6 +1604,7 @@ Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2 # These all agree with Trinidad and Tobago since 1970. Link America/Port_of_Spain America/Anguilla +Link America/Port_of_Spain America/Antigua Link America/Port_of_Spain America/Dominica Link America/Port_of_Spain America/Grenada Link America/Port_of_Spain America/Guadeloupe -- 2.1.0