[src/trunk]: src/share/zoneinfo Merge tzdata2014e

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/197be386bc47
branches:  trunk
changeset: 329915:197be386bc47
user:      apb <apb%NetBSD.org@localhost>
date:      Fri Jun 13 19:54:04 2014 +0000

description:
Merge tzdata2014e

diffstat:

 share/zoneinfo/australasia |  28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diffs (58 lines):

diff -r 459e724d0ead -r 197be386bc47 share/zoneinfo/australasia
--- a/share/zoneinfo/australasia        Fri Jun 13 19:48:55 2014 +0000
+++ b/share/zoneinfo/australasia        Fri Jun 13 19:54:04 2014 +0000
@@ -250,24 +250,14 @@
 Zone Indian/Christmas  7:02:52 -       LMT     1895 Feb
                        7:00    -       CXT     # Christmas Island Time
 
-# Cook Is
-# From Shanks & Pottenger:
-# Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-Rule   Cook    1978    only    -       Nov     12      0:00    0:30    HS
-Rule   Cook    1979    1991    -       Mar     Sun>=1  0:00    0       -
-Rule   Cook    1979    1990    -       Oct     lastSun 0:00    0:30    HS
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
-Zone Pacific/Rarotonga -10:39:04 -     LMT     1901            # Avarua
-                       -10:30  -       CKT     1978 Nov 12     # Cook Is Time
-                       -10:00  Cook    CK%sT
-
-# Cocos
+# Cocos (Keeling) Is
 # These islands were ruled by the Ross family from about 1830 to 1978.
 # We don't know when standard time was introduced; for now, we guess 1900.
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
 Zone   Indian/Cocos    6:27:40 -       LMT     1900
                        6:30    -       CCT     # Cocos Islands Time
 
+
 # Fiji
 
 # Milne gives 11:55:44 for Suva.
@@ -473,7 +463,8 @@
 Rule   NZ      1934    1940    -       Sep     lastSun 2:00    0:30    S
 Rule   NZ      1946    only    -       Jan      1      0:00    0       S
 # Since 1957 Chatham has been 45 minutes ahead of NZ, but there's no
-# convenient notation for this so we must duplicate the Rule lines.
+# convenient single notation for the date and time of this transition
+# so we must duplicate the Rule lines.
 Rule   NZ      1974    only    -       Nov     Sun>=1  2:00s   1:00    D
 Rule   Chatham 1974    only    -       Nov     Sun>=1  2:45s   1:00    D
 Rule   NZ      1975    only    -       Feb     lastSun 2:00s   0       S
@@ -511,6 +502,17 @@
 # previously whalers, sealers, pastoralists, and scientific personnel wintered
 # was probably like Pacific/Auckland
 
+# Cook Is
+# From Shanks & Pottenger:
+# Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
+Rule   Cook    1978    only    -       Nov     12      0:00    0:30    HS
+Rule   Cook    1979    1991    -       Mar     Sun>=1  0:00    0       -
+Rule   Cook    1979    1990    -       Oct     lastSun 0:00    0:30    HS
+# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+Zone Pacific/Rarotonga -10:39:04 -     LMT     1901            # Avarua
+                       -10:30  -       CKT     1978 Nov 12     # Cook Is Time
+                       -10:00  Cook    CK%sT
+
 ###############################################################################