From 99ee59707bafccd24e6dd38190cb3501ffa5c70a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 6 Apr 2001 21:11:42 +0000 Subject: [PATCH] Update. * timezone/antarctica: Update from tzdata2001b. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/europe: Likewise. * timezone/northamerica: Likewise. --- ChangeLog | 6 +++++ timezone/antarctica | 43 ++++++++++++++++++-------------- timezone/asia | 9 ++++--- timezone/australasia | 11 ++++++--- timezone/europe | 33 +++++++++++++------------ timezone/northamerica | 68 +++++++++++++++++++++++++++++++++++---------------- 6 files changed, 107 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9dc6f3..1432224 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2001-04-06 Ulrich Drepper + * timezone/antarctica: Update from tzdata2001b. + * timezone/asia: Likewise. + * timezone/australasia: Likewise. + * timezone/europe: Likewise. + * timezone/northamerica: Likewise. + * iconv/iconv_open.c: Move strip and upstr definitions... * iconv/gconv_charset.h: ...here. New file. * iconv/gconv_db.c (once): Move to file level. diff --git a/timezone/antarctica b/timezone/antarctica index 3a2b64a..c98e528 100644 --- a/timezone/antarctica +++ b/timezone/antarctica @@ -1,4 +1,4 @@ -# @(#)antarctica 7.20 +# @(#)antarctica 7.21 # From Paul Eggert (1999-11-15): # To keep things manageable, we list only locations occupied year-round; see @@ -200,25 +200,27 @@ Rule NZAQ 1990 max - Mar Sun>=15 2:00s 0 S # Russia - year-round bases # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22 # Mirny, Davis coast, -6633+09301, since 1956-02 -# Molodezhnaya -# Novolazarevskaya +# Molodezhnaya, Alasheyev Bay, year-round from 1962-02 to 1999-07-01 +# Novolazarevskaya, Queen Maud Land, -7046+01150, +# year-round from 1960/61 to 1992 -# Vostok, since 1957-12-16 +# Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11 # # From Craig Mundell (1994-12-15): # Vostok, which is one of the Russian stations, is set on the same # time as Moscow, Russia. # -# From Paul Eggert (2001-03-03): -# Today I talked with a neighbor Robert Lee Hotz, a neighbor who -# recently returned from Vostok. He said that the Americans have a -# substation next to Vostok that keeps New Zealand time. -# He thought the Russians still use Moscow time, but wasn't sure. +# From Lee Hotz (2001-03-08): +# I queried the folks at Columbia who spent the summer at Vostok and this is +# what they had to say about time there: +# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo) +# time, which is 12 hours ahead of GMT. The Russian Station Vostok was +# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead +# of GMT). This is a time zone I think two hours east of Moscow. The +# natural time zone is in between the two: 8 hours ahead of GMT.'' # Zone Antarctica/Vostok 0 - zzz 1957 Dec 16 - 3:00 RussAQ MSK/MSD 1991 Mar 31 2:00s - 2:00 RussAQ EE%sT 1992 Jan 19 2:00s - 3:00 RussAQ MSK/MSD + 6:00 - VOST # Vostok time # S Africa - year-round bases # Marion Island @@ -231,14 +233,16 @@ Zone Antarctica/Vostok 0 - zzz 1957 Dec 16 # scientific station from 1903 # whaling station at Signy I 1920/1926 # South Shetland Islands -# whaling station at Deception I 1912/1931 -# scientific station from 1943; -# previously sealers and a scientific expedition wintered by accident, -# and a garrison was deployed briefly # # year-round bases # Bird Island, South Georgia, -5400-03803, since 1983 -# Halley, Coates Land, -7535-2619, since 1956-01-06 +# Deception Island, -6259-06034, whaling station 1912/1931, +# scientific station 1943/1967, +# previously sealers and a scientific expedition wintered by accident, +# and a garrison was deployed briefly +# Halley, Coates Land, -7535-02604, since 1956-01-06 +# Halley is on a moving ice shelf and is periodically relocated +# so that it is never more than 10km from its nominal location. # Rothera, Adelaide Island, -6734-6808, since 1976-12-01 # Uruguay - year round base @@ -262,12 +266,13 @@ Zone Antarctica/Palmer 0 - zzz 1965 -4:00 ChileAQ CL%sT # # -# McMurdo, Ross Island, since 1956 +# McMurdo, Ross Island, since 1955-12 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Antarctica/McMurdo 0 - zzz 1956 12:00 NZAQ NZ%sT # -# Amundsen-Scott, South Pole, since 1957-01-23 +# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20 +# # From Paul Eggert (1996-09-03): # Normally it wouldn't have a separate entry, since it's like the # larger Antarctica/McMurdo since 1970, but it's too famous to omit. diff --git a/timezone/asia b/timezone/asia index a28a708..2d7520a 100644 --- a/timezone/asia +++ b/timezone/asia @@ -1,4 +1,4 @@ -# @(#)asia 7.62 +# @(#)asia 7.63 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to @@ -1111,7 +1111,10 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct # no information # Philippines -# Howse writes (p 153) that until 1844 the Philippines kept American date. +# On 1844-08-16, Narciso Claveria, governor-general of the +# Philippines, issued a proclamation announcing that 1844-12-30 was to +# be immediately followed by 1845-01-01. Robert H. van Gent has a +# transcript of the decree in . # The rest of this data is from Shanks. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Phil 1936 only - Nov 1 0:00 1:00 S @@ -1121,7 +1124,7 @@ Rule Phil 1954 only - Jul 1 0:00 0 - Rule Phil 1978 only - Mar 22 0:00 1:00 S Rule Phil 1978 only - Sep 21 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Manila -15:56:00 - LMT 1844 +Zone Asia/Manila -15:56:00 - LMT 1844 Dec 31 8:04:00 - LMT 1899 May 11 8:00 Phil PH%sT 1942 May 9:00 - JST 1944 Nov diff --git a/timezone/australasia b/timezone/australasia index c9d3046..fe01a3e 100644 --- a/timezone/australasia +++ b/timezone/australasia @@ -1,4 +1,4 @@ -# @(#)australasia 7.63 +# @(#)australasia 7.64 # This file also includes Pacific islands. # Notes are at the end of this file @@ -222,7 +222,8 @@ Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete # Guam # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Guam 9:39:00 - LMT 1901 # Agana +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 @@ -241,7 +242,8 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901 # N Mariana Is # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Saipan 9:43:00 - LMT 1901 +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 @@ -977,7 +979,8 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # Howse writes (p 153) ``The Spaniards, on the other hand, reached the # Philippines and the Ladrones from America,'' and implies that the Ladrones # (now called the Marianas) kept American date for quite some time. -# Ignore this for now, as we have no hard data. See also Asia/Manila. +# For now, we assume the Ladrones switched at the same time as the Philippines; +# see Asia/Manila. # US Public Law 106-564 (2000-12-23) made UTC+10 the official standard time, # under the name "Chamorro Standard Time". There is no official abbreviation, diff --git a/timezone/europe b/timezone/europe index d45088d..43b4af3 100644 --- a/timezone/europe +++ b/timezone/europe @@ -1,4 +1,4 @@ -# @(#)europe 7.77 +# @(#)europe 7.78 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to @@ -405,6 +405,11 @@ Rule EU 1978 only - Oct 1 1:00u 0 - Rule EU 1979 1995 - Sep lastSun 1:00u 0 - Rule EU 1981 max - Mar lastSun 1:00u 1:00 S Rule EU 1996 max - Oct lastSun 1:00u 0 - +# The most recent directive covers the years starting in 2002. See: +# # W-Eur differs from EU only in that W-Eur uses standard time. Rule W-Eur 1977 1980 - Apr Sun>=1 1:00s 1:00 S @@ -1368,37 +1373,33 @@ Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15 # Netherlands # Howse writes that the Netherlands' railways used GMT between 1892 and 1940, # but for other purposes the Netherlands used Amsterdam mean time. +# The data before 1945 is taken from +# . # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -# Shanks gives 1916 Apr 30 24:00 and 1916 Oct 1 00:00; go with Whitman. -Rule Neth 1916 only - May 1 2:00s 1:00 NST # Netherlands Summer Time -Rule Neth 1916 only - Oct 2 2:00s 0 AMT # Amsterdam Mean Time +Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time +Rule Neth 1916 only - Oct 1 0:00 0 AMT # Amsterdam Mean Time Rule Neth 1917 only - Apr 16 2:00s 1:00 NST Rule Neth 1917 only - Sep 17 2:00s 0 AMT -# Whitman gives 1918 Apr 14, 1918 Oct 31, and 1921 Sep 28; go with Shanks. Rule Neth 1918 1921 - Apr Mon>=1 2:00s 1:00 NST -Rule Neth 1918 1921 - Sep Mon>=24 2:00s 0 AMT -Rule Neth 1922 only - Mar 26 2:00s 1:00 NST -# Whitman gives 1939 Oct 1; go with Shanks. +Rule Neth 1918 1921 - Sep lastSun 2:00s 0 AMT +Rule Neth 1922 only - Mar lastSun 2:00s 1:00 NST Rule Neth 1922 1936 - Oct Sun>=2 2:00s 0 AMT -Rule Neth 1923 only - Jun 1 2:00s 1:00 NST -Rule Neth 1924 only - Mar 30 2:00s 1:00 NST -# Whitman gives 1925 Apr 5; go with Shanks. -Rule Neth 1925 only - Jun 5 2:00s 1:00 NST -# For 1926 through 1930 Whitman gives Apr 15; go with Shanks. +Rule Neth 1923 only - Jun Fri>=1 2:00s 1:00 NST +Rule Neth 1924 only - Mar lastSun 2:00s 1:00 NST +Rule Neth 1925 only - Jun Fri>=1 2:00s 1:00 NST Rule Neth 1926 1931 - May 15 2:00s 1:00 NST Rule Neth 1932 only - May 22 2:00s 1:00 NST Rule Neth 1933 1936 - May 15 2:00s 1:00 NST Rule Neth 1937 only - May 22 2:00s 1:00 NST Rule Neth 1937 only - Jul 1 0:00 1:00 S Rule Neth 1937 1939 - Oct Sun>=2 2:00s 0 - -# Whitman gives 1939 Apr 15 and 1940 Apr 19; go with Shanks. Rule Neth 1938 1939 - May 15 2:00s 1:00 S Rule Neth 1945 only - Apr 2 2:00s 1:00 S -Rule Neth 1945 only - May 20 2:00s 0 - +Rule Neth 1945 only - Sep 16 2:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Amsterdam 0:19:28 - LMT 1892 May 0:19:28 Neth %s 1937 Jul - 0:20 Neth NE%sT 1940 May 16 0:40 + 0:20 Neth NE%sT 1940 May 17 0:00 1:00 C-Eur CE%sT 1945 Apr 2 2:00 1:00 Neth CE%sT 1977 1:00 EU CE%sT diff --git a/timezone/northamerica b/timezone/northamerica index 9266fab..58e790c 100644 --- a/timezone/northamerica +++ b/timezone/northamerica @@ -1,4 +1,4 @@ -# @(#)northamerica 7.56 +# @(#)northamerica 7.58 # also includes Central America and the Caribbean # This data is by no means authoritative; if you think you know better, @@ -280,40 +280,47 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:00 # Alaska # AK%sT is the modern abbreviation for -9:00 per USNO. # -# From Paul Eggert (1995-12-19): +# From Paul Eggert (2001-04-01): # Howse writes that Alaska switched from the Julian to the Gregorian calendar, # and from east-of-GMT to west-of-GMT days, when the US bought it from Russia. -# This was on 1867-10-18. We omit this transition, since we can't represent -# changes from Julian to Gregorian. +# This was on 1867-10-18, a Friday; the previous day was 1867-10-06 Julian, +# also a Friday. Include only the time zone part of this transition, +# ignoring the switch from Julian to Gregorian, since we can't represent +# the Julian calendar. # # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone America/Juneau -8:57:41 - LMT 1900 Aug 20 12:00 +Zone America/Juneau 15:02:19 - LMT 1867 Oct 18 + -8:57:41 - LMT 1900 Aug 20 12:00 -8:00 - PST 1942 -8:00 US P%sT 1946 -8:00 - PST 1969 -8:00 US P%sT 1983 Oct 30 2:00 -9:00 US AK%sT -Zone America/Yakutat -9:18:55 - LMT 1900 Aug 20 12:00 +Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18 + -9:18:55 - LMT 1900 Aug 20 12:00 -9:00 - YST 1942 -9:00 US Y%sT 1946 -9:00 - YST 1969 -9:00 US Y%sT 1983 Oct 30 2:00 -9:00 US AK%sT -Zone America/Anchorage -9:59:36 - LMT 1900 Aug 20 12:00 +Zone America/Anchorage 14:00:24 - LMT 1867 Oct 18 + -9:59:36 - LMT 1900 Aug 20 12:00 -10:00 - CAT 1942 -10:00 US CAT/CAWT 1946 -10:00 - CAT 1967 Apr -10:00 - AHST 1969 -10:00 US AH%sT 1983 Oct 30 2:00 -9:00 US AK%sT -Zone America/Nome -11:01:38 - LMT 1900 Aug 20 12:00 +Zone America/Nome 12:58:21 - LMT 1867 Oct 18 + -11:01:38 - LMT 1900 Aug 20 12:00 -11:00 - NST 1942 -11:00 US N%sT 1946 -11:00 - NST 1967 Apr -11:00 - BST 1969 -11:00 US B%sT 1983 Oct 30 2:00 -9:00 US AK%sT -Zone America/Adak -11:46:38 - LMT 1900 Aug 20 12:00 +Zone America/Adak 12:13:21 - LMT 1867 Oct 18 + -11:46:38 - LMT 1900 Aug 20 12:00 -11:00 - NST 1942 -11:00 US N%sT 1946 -11:00 - NST 1967 Apr @@ -1138,6 +1145,16 @@ Zone America/Dawson_Creek -8:00:56 - LMT 1884 # From Paul Eggert (2000-12-04): # Let's just keep track of the official times for now. +# From Rives McDow (2001-03-07): +# The premier of Nunavut has issued a ministerial statement advising +# that effective 2001-04-01, the territory of Nunavut will revert +# back to three time zones (mountain, central, and eastern). Of the +# cities in Nunavut, Coral Harbor is the only one that I know of that +# has said it will not observe dst, staying on EST year round. I'm +# checking for more info, and will get back to you if I come up with +# more. +# [Also see (2001-03-09).] + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule NT_YK 1918 only - Apr 14 2:00 1:00 D Rule NT_YK 1918 only - Oct 27 2:00 0 S @@ -1155,19 +1172,21 @@ Zone America/Pangnirtung -4:22:56 - LMT 1884 -4:00 NT_YK A%sT 1995 Apr Sun>=1 2:00 -5:00 Canada E%sT 1999 Oct 31 2:00 -6:00 Canada C%sT 2000 Oct 29 2:00 - -5:00 - EST + -5:00 Canada E%sT Zone America/Iqaluit -4:33:52 - LMT 1884 # Frobisher Bay before 1987 -5:00 NT_YK E%sT 1999 Oct 31 2:00 -6:00 Canada C%sT 2000 Oct 29 2:00 - -5:00 - EST + -5:00 Canada E%sT Zone America/Rankin_Inlet -6:08:40 - LMT 1884 -6:00 NT_YK C%sT 2000 Oct 29 2:00 - -5:00 - EST + -5:00 - EST 2001 Apr 1 3:00 + -6:00 Canada C%sT Zone America/Cambridge_Bay -7:00:20 - LMT 1884 -7:00 NT_YK M%sT 1999 Oct 31 2:00 -6:00 Canada C%sT 2000 Oct 29 2:00 -5:00 - EST 2000 Nov 5 0:00 - -6:00 Canada C%sT + -6:00 - CST 2001 Apr 1 3:00 + -7:00 Canada M%sT Zone America/Yellowknife -7:37:24 - LMT 1884 -7:00 NT_YK M%sT Zone America/Inuvik -8:54:00 - LMT 1884 @@ -1294,16 +1313,25 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 # James F. Smith writes in today's LA Times # # * Sonora will continue to observe standard time. -# * Border states including Baja California, Chihuahua, and Nuevo Leon -# will use US rules, # * Last week Mexico City's mayor Andres Manuel Lopez Obrador decreed that # the Federal District will not adopt DST. # * 4 of 16 district leaders announced they'll ignore the decree. # * The decree does not affect federal-controlled facilities including # the airport, banks, hospitals, and schools. # -# For now we'll assume that the Federal District will bow to federal rules -# and that border states and Durango will stick with US rules. +# For now we'll assume that the Federal District will bow to federal rules. + +# From Jesper Norgaard (2001-04-01): +# I found some references to the Mexican application of daylight +# saving, which modifies what I had already sent you, stating earlier +# that a number of northern Mexican states would go on daylight +# saving. The modification reverts this to only cover Baja California +# (Norte), while all other states (except Sonora, who has no daylight +# saving all year) will follow the original decree of president +# Vicente Fox, starting daylight saving May 6, 2001 and ending +# September 30, 2001. +# References: "Diario de Monterrey" +# Palabra (2001-03-31) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Mexico 1939 only - Feb 5 0:00 1:00 D @@ -1333,8 +1361,7 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32 Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44 -6:00 - CST 1988 -6:00 US C%sT 1989 - -6:00 Mexico C%sT 2001 - -6:00 US C%sT + -6:00 Mexico C%sT # Central Mexico Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24 -7:00 - MST 1927 Jun 10 23:00 @@ -1353,8 +1380,7 @@ Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40 -6:00 - CST 1996 -6:00 Mexico C%sT 1998 -6:00 - CST 1998 Apr Sun>=1 3:00 - -7:00 Mexico M%sT 2001 - -7:00 US M%sT + -7:00 Mexico M%sT # Sonora Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08 -7:00 - MST 1927 Jun 10 23:00 -- 2.7.4