diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | timezone/README | 4 | ||||
| -rw-r--r-- | timezone/africa | 11 | ||||
| -rw-r--r-- | timezone/antarctica | 49 | ||||
| -rw-r--r-- | timezone/asia | 16 | ||||
| -rw-r--r-- | timezone/australasia | 21 | ||||
| -rw-r--r-- | timezone/europe | 58 | ||||
| -rw-r--r-- | timezone/northamerica | 11 | ||||
| -rw-r--r-- | timezone/southamerica | 20 | ||||
| -rw-r--r-- | timezone/zic.c | 24 | ||||
| -rw-r--r-- | timezone/zone.tab | 1 |
11 files changed, 119 insertions, 111 deletions
diff --git a/ChangeLog b/ChangeLog index cb59870781..cfe31b936e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +1999-03-25 Andreas Jaeger <aj@arthur.rhein-neckar.de> + + * timezone/README: Update from tzdata1999c and tzcode1999c. + + * timezone/africa: Update from tzdata1999c. + * timezone/antarctica: Likewise. + * timezone/asia: Likewise. + * timezone/australasia: Likewise. + * timezone/europe: Likewise. + * timezone/northamerica: Likewise. + * timezone/southamerica: Likewise. + * timezone/zone.tab: Likewise. + + * timezone/zic.c: Update from tzcode1999c. + 1999-03-26 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * Makerules: Add $(common-objpfx)Versions.all to common-generated diff --git a/timezone/README b/timezone/README index dd26cb512f..a9490fa001 100644 --- a/timezone/README +++ b/timezone/README @@ -1,14 +1,14 @@ The files zic.c zdump.c ialloc.c scheck.c tzfile.h private.h tzselect.ksh checktab.awk -come from the tzcode1998h package by Arthur David Olson et.al. +come from the tzcode1999c package by Arthur David Olson et.al. The files africa antarctica asia australasia europe northamerica southamerica pacificnew etcetera factory backward systemv solar87 solar88 solar89 iso3166.tab zone.tab leapseconds yearistype -come from the tzdata1999b package by Arthur David Olson et.al. +come from the tzdata1999c package by Arthur David Olson et.al. These packages may be found at ftp://elsie.nci.nih.gov/pub/. Commentary should be addressed to tz@elsie.nci.nih.gov. diff --git a/timezone/africa b/timezone/africa index 2585a7912a..1a2e339e2e 100644 --- a/timezone/africa +++ b/timezone/africa @@ -1,10 +1,10 @@ -# @(#)africa 7.26 +# @(#)africa 7.27 # 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 # tz@elsie.nci.nih.gov for general use in the future). -# From Paul Eggert <eggert@twinsun.com> (1997-10-05): +# From Paul Eggert <eggert@twinsun.com> (1999-03-22): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks, The International Atlas (4th edition), @@ -24,7 +24,7 @@ # I found in the UCLA library. # # A reliable and entertaining source about time zones is -# Derek Howse, Greenwich time and the discovery of the longitude, +# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). # Oxford University Press (1980). # # Previous editions of this database used WAT, CAT, SAT, and EAT @@ -470,7 +470,8 @@ Zone Atlantic/St_Helena -0:22:48 - LMT 1890 # Jamestown # The other parts of the St Helena territory are similar: # Tristan da Cunha: on GMT, say Whitman and the CIA # Ascension: on GMT, says usno1995 and the CIA -# Gough (scientific station since 1955): on GMT, says the CIA +# Gough (scientific station since 1955; sealers wintered previously): +# on GMT, says the CIA # Inaccessible, Nightingale: no information, but probably GMT # Sao Tome and Principe @@ -522,7 +523,7 @@ Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8 # on 1994-04-03 at 00:00. # # Marion and Prince Edward Is -# weather station since 1947 +# scientific station since 1947 # no information # Sudan diff --git a/timezone/antarctica b/timezone/antarctica index f5422b2bf1..feee35033f 100644 --- a/timezone/antarctica +++ b/timezone/antarctica @@ -1,14 +1,13 @@ -# @(#)antarctica 7.14 +# @(#)antarctica 7.15 -# From Paul Eggert (1997-03-28): -# To keep things manageable, we list only locations occupied year-round; -# see -# <a href="http://earth.agu.org/amen/nations.html"> +# From Paul Eggert (1999-03-22): +# To keep things manageable, we list only locations occupied year-round; see +# <a href="http://www.delm.tas.gov.au/comnap/members.html"> # Antarctic Activities of Member Nations of the Antarctic Treaty (1996-05-24) # </a> # and # <a href="http://www.spri.cam.ac.uk/bob/periant.htm"> -# Summary of the Peri-Antarctic Islands (1996-09-05) +# Summary of the Peri-Antarctic Islands (1998-07-23) # </a> # for information. # Unless otherwise specified, we have no time zone information. @@ -28,8 +27,12 @@ Rule ArgAQ 1974 only - Jan 23 0:00 1:00 S Rule ArgAQ 1974 only - May 1 0:00 0 - Rule ArgAQ 1974 1976 - Oct Sun<=7 0:00 1:00 S Rule ArgAQ 1975 1977 - Apr Sun<=7 0:00 0 - -Rule ChileAQ 1969 max - Oct Sun>=9 0:00 1:00 S -Rule ChileAQ 1970 max - Mar Sun>=9 0:00 0 - +Rule ChileAQ 1969 1997 - Oct Sun>=9 0:00 1:00 S +Rule ChileAQ 1970 1998 - Mar Sun>=9 0:00 0 - +Rule ChileAQ 1998 only - Sep 27 0:00 1:00 S +Rule ChileAQ 1999 only - Apr 4 0:00 0 - +Rule ChileAQ 1999 max - Oct Sun>=9 0:00 1:00 S +Rule ChileAQ 2000 max - Mar Sun>=9 0:00 0 - # Argentina - 6 year-round bases @@ -38,6 +41,7 @@ Rule ChileAQ 1970 max - Mar Sun>=9 0:00 0 - # Australia - territories # Heard Island, McDonald Islands (uninhabited) +# previously sealers and scientific personnel wintered # # year-round bases # Casey, Bailey Peninsula, since 1969 @@ -89,9 +93,10 @@ Zone Antarctica/Mawson 0 - ___ 1954 Feb 13 # Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950 # Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964 # Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951; -# a whaling and sealing station operated 1908-14, 1920-29, and 1951-56 +# whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956 # -# St Paul Island - near Amsterdam, uninhabited since 1931 +# St Paul Island - near Amsterdam, uninhabited +# fishing stations operated variously 1819/1931 # # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Indian/Kerguelen 0 - ___ 1950 # Port-aux-Francais @@ -123,6 +128,22 @@ Zone Antarctica/DumontDUrville 0 - ___ 1947 # Japan - year-round bases # Dome Fuji # Syowa +# +# From Hideyuki Suzuki (1999-02-06): +# In all Japanese stations, +0300 is used as the standard time. [See] +# <a href="http://www.crl.go.jp/uk/uk201/basyo.htm">[reference in Japanese]</a> +# and information from KAMO Hiroyasu <wd@ics.nara-wu.ac.jp>. +# +# Syowa station, which is the first antarctic station of Japan, +# was established on 1957-01-29. Since Syowa station is still the main +# station of Japan, it's appropriate for the principal location. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Antarctica/Syowa 0 - ___ 1957 Jan 29 + 3:00 - SYOT # Syowa Time +# See: +# <a href="http://www.nipr.ac.jp/english/jare.html"> +# Japanese Antarctic Research Expedition (JARE) (1998-04-09) +# </a> # S Korea - year-round base # King Sejong, King George Island, since 1988 @@ -169,10 +190,12 @@ Rule NZAQ 1990 max - Mar Sun>=15 2:00s 0 S # British Antarctic Territories (BAT) claims # South Orkney Islands # scientific station from 1903 -# whaling station at Signy I 1920-1926 +# whaling station at Signy I 1920/1926 # South Shetland Islands -# whaling station at Deception I 1912-1931 -# scientific station from 1943 +# 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 # Halley, Coates Land, -7535-2619, since 1956-01-06 diff --git a/timezone/asia b/timezone/asia index 22b4cda78d..23047d5229 100644 --- a/timezone/asia +++ b/timezone/asia @@ -1,10 +1,10 @@ -# @(#)asia 7.41 +# @(#)asia 7.42 # 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 # tz@elsie.nci.nih.gov for general use in the future). -# From Paul Eggert <eggert@twinsun.com> (1996-11-22): +# From Paul Eggert <eggert@twinsun.com> (1999-03-22): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks, The International Atlas (4th edition), @@ -25,8 +25,7 @@ # I found in the UCLA library. # # A reliable and entertaining source about time zones is -# Derek Howse, Greenwich time and the discovery of the longitude, -# Oxford University Press (1980). +# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). # # I invented the abbreviations marked `*' in the following table; # the rest are from earlier versions of this file, or from other sources. @@ -562,13 +561,12 @@ Rule Zion 1995 only - Sep 3 0:00 0 S # ftp://ftp.huji.ac.il/pub/tz/announcements/1996-1998.ramon.ps.gz # # The dates for 1997-1998 were altered by his successor, Rabbi Eli Suissa. -# The official announcement for the year 1997 can be viewed at: # -# ftp://ftp.huji.ac.il/pub/tz/announcements/1997.ps.gz +# The official announcements for the years 1997-1999 can be viewed at: # -# The official announcement for the year 1998 can be viewed at: +# ftp://ftp.huji.ac.il/pub/tz/announcements/YYYY.ps.gz # -# ftp://ftp.huji.ac.il/pub/tz/announcements/1998.ps.gz +# where YYYY is the relevant year. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Zion 1996 only - Mar 15 0:00 1:00 D @@ -950,7 +948,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct # no information # Philippines -# Howse writes (p 162) that until 1844 the Philippines kept American date. +# Howse writes that until 1844 the Philippines kept American date. # 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 diff --git a/timezone/australasia b/timezone/australasia index d97a3c6ae6..c5b018e952 100644 --- a/timezone/australasia +++ b/timezone/australasia @@ -1,4 +1,4 @@ -# @(#)australasia 7.45 +# @(#)australasia 7.46 # This file also includes Pacific islands. # Notes are at the end of this file @@ -173,7 +173,7 @@ Zone Australia/Lord_Howe 10:36:20 - LMT 1895 Feb # # Macquarie # permanent occupation (scientific station) since 1948; -# sealing and penguin oil station operated 1888-1917 +# sealing and penguin oil station operated 1888/1917 # no information # # Manihiki, Penrhyn, Rakehanga @@ -319,11 +319,13 @@ Zone Pacific/Chatham 12:45 Chatham CHA%sT # Auckland Is -# uninhabited +# uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers, +# and scientific personnel have wintered # Campbell I -# minor whaling stations operated 1909-14 -# scientific station operated 1941-1995 +# minor whaling stations operated 1909/1914 +# scientific station operated 1941/1995; +# previously whalers, sealers, pastoralists, and scientific personnel wintered # was probably like Pacific/Auckland ############################################################################### @@ -452,7 +454,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # go ahead and edit the file (and please send any changes to # tz@elsie.nci.nih.gov for general use in the future). -# From Paul Eggert <eggert@twinsun.com> (1996-11-22): +# From Paul Eggert <eggert@twinsun.com> (1999-03-22): # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks, The International Atlas (4th edition), # San Diego: ACS Publications, Inc. (1995). @@ -471,8 +473,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # I found in the UCLA library. # # A reliable and entertaining source about time zones is -# Derek Howse, Greenwich time and the discovery of the longitude, -# Oxford University Press (1980). +# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). # # I invented the abbreviations marked `*' in the following table; # the rest are from earlier versions of this file, or from other sources. @@ -896,7 +897,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # Fiji -# Howse writes (p 162) that in 1879 the British governor of Fiji +# Howse writes that in 1879 the British governor of Fiji # enacted an ordinance standardizing the islands on +12:00. # Perhaps it didn't take. We go with Shanks's more precise date in 1915. @@ -933,7 +934,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # N Mariana Is, Guam -# Howse writes (p 162) ``The Spaniards, on the other hand, reached the +# Howse writes ``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. diff --git a/timezone/europe b/timezone/europe index 98f46585e6..fe212dee0a 100644 --- a/timezone/europe +++ b/timezone/europe @@ -1,10 +1,10 @@ -# @(#)europe 7.58 +# @(#)europe 7.59 # 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 # tz@elsie.nci.nih.gov for general use in the future). -# From Paul Eggert <eggert@twinsun.com> (1996-11-22): +# From Paul Eggert <eggert@twinsun.com> (1999-03-22): # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks, The International Atlas (4th edition), # San Diego: ACS Publications, Inc. (1995). @@ -46,8 +46,7 @@ # 3:00 MSK MSD Moscow # # A reliable and entertaining source about time zones, especially in Britain, -# is Derek Howse, Greenwich time and the discovery of the longitude, -# Oxford University Press (1980). +# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). # From Peter Ilieve <peter@memex.co.uk> (1994-12-04), # The original six [EU members]: Belgium, France, (West) Germany, Italy, @@ -74,7 +73,6 @@ ############################################################################### # Britain (United Kingdom) and Ireland (Eire) -# The UK and its colonies adopted the Gregorian calendar on 1752-09-14. # From Peter Ilieve <peter@memex.co.uk> (1994-07-06): # @@ -1170,7 +1168,6 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 # see Yugosloavia # Czech Republic -# Gregorian calendar adopted 1584-01-17. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Czech 1945 only - Apr 8 2:00s 1:00 S Rule Czech 1945 only - Nov 18 2:00s 0 - @@ -1187,7 +1184,6 @@ Zone Europe/Prague 0:57:44 - LMT 1850 1:00 EU CE%sT # Denmark, Faeroe Islands, and Greenland -# Gregorian calendar adopted 1700-03-01. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Denmark 1916 only - May 14 23:00 1:00 S Rule Denmark 1916 only - Sep 30 23:00 0 - @@ -1279,7 +1275,6 @@ Zone Europe/Tallinn 1:39:00 - LMT 1880 2:00 EU EE%sT # Finland -# See Sweden for when the Gregorian calendar was adopted. # # From Hannu Strang <chs@apu.fi> (25 Sep 1994 06:03:37 UTC): # Well, here in Helsinki we're just changing from summer time to regular one, @@ -1299,9 +1294,6 @@ Zone Europe/Helsinki 1:39:52 - LMT 1878 May 31 2:00 EU EE%sT # France -# Gregorian calendar adopted 1582-12-20. -# French Revolutionary calendar used 1793-11-24 through 1805-12-31, -# and (in Paris only) 1871-05-06 through 1871-05-23. # # Shanks seems to use `24:00' ambiguously; we resolve it with Whitman. # From Shanks (1991): @@ -1451,7 +1443,6 @@ Zone Europe/Athens 1:34:52 - LMT 1895 Sep 14 2:00 EU EE%sT # Hungary -# Gregorian calendar adopted 1587-11-01. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Hungary 1918 only - Apr 1 3:00 1:00 S Rule Hungary 1918 only - Sep 29 3:00 0 - @@ -1543,7 +1534,6 @@ Zone Atlantic/Reykjavik -1:27:24 - LMT 1837 0:00 - GMT # Italy -# Gregorian calendar adopted 1582-10-15. # # From Paul Eggert (1996-05-06): # For Italian DST we have three sources: Shanks, Whitman, and F. Pollastri @@ -1816,7 +1806,6 @@ Zone Europe/Amsterdam 0:19:28 - LMT 1892 May 1:00 EU CE%sT # Norway -# Gregorian calendar adopted 1700-03-01. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Whitman gives 1916 May 21 - 1916 Oct 21; go with Shanks. Rule Norway 1916 only - May 22 1:00 1:00 S @@ -1881,7 +1870,6 @@ Zone Europe/Warsaw 1:24:00 - LMT 1880 # Stick with W-Eur for now. # Portugal -# Gregorian calendar adopted 1582-10-15. # # From Rui Pedro Salgueiro <rps@inescca.inescc.pt> (1992-11-12): # Portugal has recently (September, 27) changed timezone @@ -2006,15 +1994,6 @@ Zone Europe/Bucharest 1:44:24 - LMT 1891 Oct # Russia -# From Chris Carrier <72157.3334@CompuServe.COM> (1996-12-02): -# On 1929-10-01 the Soviet Union instituted an ``Eternal Calendar'' -# with 30-day months plus 5 holidays, with a 5-day week. -# On 1931-12-01 it changed to a 6-day week; in 1934 it reverted to the -# Gregorian calendar while retaining the 6-day week; on 1940-06-27 it -# reverted to the 7-day week. With the 6-day week the usual days -# off were the 6th, 12th, 18th, 24th and 30th of the month. -# (Source: Evitiar Zerubavel, _The Seven Day Circle_) -# # From Paul Eggert <eggert@twinsun.com> (1996-11-22): # Except for Moscow after 1919-07-01, I invented the time zone abbreviations, # and (unless otherwise specified) guessed what happened after 1991. @@ -2134,7 +2113,6 @@ Link Europe/Prague Europe/Bratislava # see Yugoslavia # Spain -# Gregorian calendar adopted 1582-10-15. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # For 1917-1919 Whitman gives Apr Sat>=1 - Oct Sat>=1; go with Shanks. Rule Spain 1917 only - May 5 23:00s 1:00 S @@ -2205,32 +2183,6 @@ Zone Atlantic/Canary -1:01:36 - LMT 1922 Mar # Las Palmas de Gran C. # Ignore this for now, as the Canaries are part of the EU. # Sweden - -# From: msb@sq.com (Mark Brader) -# <a href="news:1996Jul6.012937.29190@sq.com"> -# Subject: Re: Gregorian reform -- a part of locale? -# </a> -# Date: 1996-07-06 -# -# In 1700, Denmark made the transition from Julian to Gregorian. Sweden -# decided to *start* a transition in 1700 as well, but rather than have one of -# those unsightly calendar gaps :-), they simply decreed that the next leap -# year after 1696 would be in 1744 -- putting the whole country on a calendar -# different from both Julian and Gregorian for a period of 40 years. -# -# However, in 1704 something went wrong and the plan was not carried through; -# they did, after all, have a leap year that year. And one in 1708. In 1712 -# they gave it up and went back to Julian, putting 30 days in February that -# year!... -# -# Then in 1753, Sweden made the transition to Gregorian in the usual manner, -# getting there only 13 years behind the original schedule. -# -# (A previous posting of this story was challenged, and Swedish readers -# produced the following references to support it: "Tiderakning och historia" -# by Natanael Beckman (1924) and "Tid, en bok om tiderakning och -# kalendervasen" by Lars-Olof Lode'n (no date was given).) - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Stockholm 1:12:12 - LMT 1878 May 31 1:12:12 - SMT 1900 Jan 1 1:00 # Stockholm MT @@ -2240,9 +2192,7 @@ Zone Europe/Stockholm 1:12:12 - LMT 1878 May 31 1:00 EU CE%sT # Switzerland -# The Gregorian calendar was introduced gradually in Switzerland, -# by omitting leap years during 1583-1812. -# From Howse (1988), p 82: +# From Howse: # By the end of the 18th century clocks and watches became commonplace # and their performance improved enormously. Communities began to keep # mean time in preference to apparent time -- Geneva from 1780 .... diff --git a/timezone/northamerica b/timezone/northamerica index 5568a95c1d..e3f85021c9 100644 --- a/timezone/northamerica +++ b/timezone/northamerica @@ -1,14 +1,13 @@ -# @(#)northamerica 7.42 +# @(#)northamerica 7.43 # also includes Central America and the Caribbean # 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 # tz@elsie.nci.nih.gov for general use in the future). -# From Paul Eggert <eggert@twinsun.com> (1994-08-17): +# From Paul Eggert <eggert@twinsun.com> (1999-03-22): # A reliable and entertaining source about time zones is -# Derek Howse, Greenwich time and the discovery of the longitude, -# Oxford University Press (1980). +# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). ############################################################################### @@ -401,7 +400,7 @@ Zone America/Louisville -5:43:02 - LMT 1883 Nov 18 12:00 # # From Paul Eggert (1995-12-19): # Shanks writes that Michigan started using standard time on 1885 Sep 18, -# but Howse (p 126) writes that Detroit kept +# but Howse writes that Detroit kept # # local time until 1900 when the City Council decreed that clocks should # be put back twenty-eight minutes to Central Standard Time. Half the @@ -859,7 +858,7 @@ Zone America/Dawson_Creek -8:00:56 - LMT 1884 -7:00 - MST -# Northwest Territories, Yukon +# Northwest Territories, Nunavut, Yukon # From Paul Eggert (1996-10-07): # Dawson switched to PST in 1973. Inuvik switched to MST in 1979. diff --git a/timezone/southamerica b/timezone/southamerica index 3232c5c093..35678b9027 100644 --- a/timezone/southamerica +++ b/timezone/southamerica @@ -1,4 +1,4 @@ -# @(#)southamerica 7.26 +# @(#)southamerica 7.27 # 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 @@ -434,15 +434,21 @@ Zone America/Porto_Acre -4:31:12 - LMT 1914 # DST earlier (saturday 9/26 at 24:00). This is a one-time change only ... # (unless there's another dry season next year, I guess). +# From Julio I. Pacheco Troncoso (1999-03-18): +# Because of the same drought, the government decided to end DST later, +# on April 3, (one-time change). + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Chile 1918 only - Sep 1 0:00 1:00 S -Rule Chile 1919 only - Jul 2 0:00 0 - -Rule Chile 1927 1931 - Sep 1 0:00 1:00 S -Rule Chile 1928 1932 - Apr 1 0:00 0 - +Rule Chile 1918 only - Sep 1 0:00 1:00 S +Rule Chile 1919 only - Jul 2 0:00 0 - +Rule Chile 1927 1931 - Sep 1 0:00 1:00 S +Rule Chile 1928 1932 - Apr 1 0:00 0 - Rule Chile 1969 1997 - Oct Sun>=9 0:00 1:00 S -Rule Chile 1970 max - Mar Sun>=9 0:00 0 - +Rule Chile 1970 1998 - Mar Sun>=9 0:00 0 - Rule Chile 1998 only - Sep 27 0:00 1:00 S +Rule Chile 1999 only - Apr 4 0:00 0 - Rule Chile 1999 max - Oct Sun>=9 0:00 1:00 S +Rule Chile 2000 max - Mar Sun>=9 0:00 0 - # IATA SSIM anomalies: (1990-09) says 1990-09-16; (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these for now. # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -584,7 +590,7 @@ Zone Atlantic/South_Georgia -2:26:08 - LMT 1890 # Grytviken -2:00 - GST # South Georgia Time # South Sandwich Is -# uninhabited +# uninhabited; scientific personnel have wintered # Suriname # Zone NAME GMTOFF RULES FORMAT [UNTIL] diff --git a/timezone/zic.c b/timezone/zic.c index 040a6053d2..e37dd7326c 100644 --- a/timezone/zic.c +++ b/timezone/zic.c @@ -1,6 +1,6 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)zic.c 7.96"; +static char elsieid[] = "@(#)zic.c 7.99"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -563,12 +563,18 @@ _("%s: More than one -L option specified\n"), /* ** Make links. */ - for (i = 0; i < nlinks; ++i) + for (i = 0; i < nlinks; ++i) { + eat(links[i].l_filename, links[i].l_linenum); dolink(links[i].l_from, links[i].l_to); - if (lcltime != NULL) + } + if (lcltime != NULL) { + eat("command line", 1); dolink(lcltime, TZDEFAULT); - if (psxrules != NULL) + } + if (psxrules != NULL) { + eat("command line", 1); dolink(psxrules, TZDEFRULES); + } return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } @@ -605,12 +611,20 @@ const char * const tofile; if (mkdirs(toname) != 0) (void) exit(EXIT_FAILURE); + result = link(fromname, toname); #if (HAVE_SYMLINK - 0) if (result != 0) { - result = symlink(fromname, toname); + char *s = (char *) tofile; + register char * symlinkcontents = NULL; + while ((s = strchr(s+1, '/')) != NULL) + symlinkcontents = ecatalloc(symlinkcontents, "../"); + symlinkcontents = ecatalloc(symlinkcontents, fromfile); + + result = symlink(symlinkcontents, toname); if (result == 0) warning(_("hard link failed, symbolic link used")); + ifree(symlinkcontents); } #endif if (result != 0) { diff --git a/timezone/zone.tab b/timezone/zone.tab index cfe6e96abd..d55269832b 100644 --- a/timezone/zone.tab +++ b/timezone/zone.tab @@ -36,6 +36,7 @@ AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Base, Terre Adelie +AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I AR -3436-05827 America/Buenos_Aires E Argentina (BA, DF, SC, TF) AR -3257-06040 America/Rosario NE Argentina (SF, ER, CN, MN, CC, FM, LP, CH) AR -3124-06411 America/Cordoba W Argentina (CB, SA, TM, LR, SJ, SL, NQ, RN) |