Sync zoneinfo database with tzdata2010n from elsie.nci.nih.gov

Theory:         8.4  -> 8.5
asia:           8.61 -> 8.62
australasia:    8.18 -> 8.19
factory:        8.2  -> n/a
zone.tab:       8.37 -> 8.38

* Remove the 'factory' file and references to it. It is no longer needed.

* asia: No DST in Hong Kong in 1977 (thanks to Jesper Norgaard for
    finding the problem).

* australasia: Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to
    2011-04-03 1:00 (thanks to Raymond Hughes for a reference).

* zone.tab: Remove obsolete association of Vostok Station with South
    Magnetic Pole; add association with Lake Vostok (thanks to
    Petr Machata for finding the problem).

diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 798ae77..85574d1 100644 (file)
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -1,5 +1,4 @@
 # $FreeBSD: src/share/zoneinfo/Makefile,v 1.16.2.3 2002/08/07 16:31:52 ru Exp $
-# $DragonFly: src/share/zoneinfo/Makefile,v 1.3 2008/03/02 14:28:37 swildner Exp $
 
 CLEANFILES+=   yearistype
 
@@ -10,7 +9,7 @@ LEAPFILE=
 .endif
 
 TZFILES=       africa antarctica asia australasia etcetera europe \
-               factory northamerica southamerica systemv
+               northamerica southamerica systemv
 POSIXRULES=    America/New_York
 
 .if defined(OLDTIMEZONES)

diff --git a/share/zoneinfo/Theory b/share/zoneinfo/Theory
index abdad24..b1e6bd5 100644 (file)
--- a/share/zoneinfo/Theory
+++ b/share/zoneinfo/Theory
@@ -1,4 +1,4 @@
-@(#)Theory     8.4
+@(#)Theory     8.5
 This file is in the public domain, so clarified as of
 2009-05-17 by Arthur David Olson.
 
@@ -287,8 +287,7 @@ and these older names are still supported.
 See the file `backward' for most of these older names
 (e.g. `US/Eastern' instead of `America/New_York').
 The other old-fashioned names still supported are
-`WET', `CET', `MET', `EET' (see the file `europe'),
-and `Factory' (see the file `factory').
+`WET', `CET', `MET', and `EET' (see the file `europe').
 
 
 ----- Time zone abbreviations -----

diff --git a/share/zoneinfo/asia b/share/zoneinfo/asia
index 84035cd..45908bd 100644 (file)
--- a/share/zoneinfo/asia
+++ b/share/zoneinfo/asia
@@ -1,4 +1,4 @@
-# @(#)asia     8.61
+# @(#)asia     8.62
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -547,8 +547,8 @@ Rule        HK      1953    only    -       Nov     1       3:30    0       -
 Rule   HK      1954    1964    -       Mar     Sun>=18 3:30    1:00    S
 Rule   HK      1954    only    -       Oct     31      3:30    0       -
 Rule   HK      1955    1964    -       Nov     Sun>=1  3:30    0       -
-Rule   HK      1965    1977    -       Apr     Sun>=16 3:30    1:00    S
-Rule   HK      1965    1977    -       Oct     Sun>=16 3:30    0       -
+Rule   HK      1965    1976    -       Apr     Sun>=16 3:30    1:00    S
+Rule   HK      1965    1976    -       Oct     Sun>=16 3:30    0       -
 Rule   HK      1973    only    -       Dec     30      3:30    1:00    S
 Rule   HK      1979    only    -       May     Sun>=8  3:30    1:00    S
 Rule   HK      1979    only    -       Oct     Sun>=16 3:30    0       -

diff --git a/share/zoneinfo/australasia b/share/zoneinfo/australasia
index 8fb7fe9..066e874 100644 (file)
--- a/share/zoneinfo/australasia
+++ b/share/zoneinfo/australasia
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)australasia      8.18
+# @(#)australasia      8.19
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -487,11 +487,21 @@ Zone Pacific/Pago_Pago     12:37:12 -     LMT     1879 Jul  5
 # http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf
 # </a>
 
+# From Raymond Hughes (2010-10-07):
+# Please see
+# <a href="http://www.mcil.gov.ws">
+# http://www.mcil.gov.ws
+# </a>,
+# the Ministry of Commerce, Industry and Labour (sideframe) "Last Sunday
+# September 2010 (26/09/10) - adjust clocks forward from 12:00 midnight
+# to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks
+# backwards from 1:00am to 12:00am"
+
 Zone Pacific/Apia       12:33:04 -     LMT     1879 Jul  5
                        -11:26:56 -     LMT     1911
                        -11:30  -       SAMT    1950            # Samoa Time
                        -11:00  -       WST     2010 Sep 26
-                       -11:00  1:00    WSDT    2011 Apr 3
+                       -11:00  1:00    WSDT    2011 Apr 3 1:00
                        -11:00  -       WST
 
 # Solomon Is

diff --git a/share/zoneinfo/factory b/share/zoneinfo/factory
deleted file mode 100644 (file)
index 624ccc0..0000000
--- a/share/zoneinfo/factory
+++ /dev/null
@@ -1,11 +0,0 @@
-# <pre>
-# @(#)factory  8.2
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# For companies who don't want to put time zone specification in
-# their installation procedures.  When users run date, they'll get the message.
-# Also useful for the "comp.sources" version.
-
-# Zone NAME    GMTOFF  RULES   FORMAT
-Zone   Factory 0       - "Local time zone must be set--see zic manual page"

diff --git a/share/zoneinfo/zone.tab b/share/zoneinfo/zone.tab
index 1dc2add..2bdf923 100644 (file)
--- a/share/zoneinfo/zone.tab
+++ b/share/zoneinfo/zone.tab
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)zone.tab 8.37
+# @(#)zone.tab 8.38
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -41,7 +41,7 @@ AQ    -6448-06406     Antarctica/Palmer       Palmer Station, Anvers Island
 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     -7824+10654     Antarctica/Vostok       Vostok Station, S Magnetic Pole
+AQ     -7824+10654     Antarctica/Vostok       Vostok Station, Lake Vostok
 AQ     -6640+14001     Antarctica/DumontDUrville       Dumont-d'Urville Station, Terre Adelie
 AQ     -690022+0393524 Antarctica/Syowa        Syowa Station, E Ongul I
 AQ     -5430+15857     Antarctica/Macquarie    Macquarie Island Station, Macquarie Island