Module Name: src
Committed By: apb
Date: Thu Dec 26 17:09:39 UTC 2013
Modified Files:
src/share/zoneinfo: Makefile australasia
Added Files:
src/share/zoneinfo: README
Removed Files:
src/share/zoneinfo: solar87 solar88 solar89
Log Message:
Merge tzdata2013i. We previously has tzdata2013d plus part of
tzdata2013e.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/share/zoneinfo/Makefile
cvs rdiff -u -r0 -r1.3 src/share/zoneinfo/README
cvs rdiff -u -r1.33 -r1.34 src/share/zoneinfo/australasia
cvs rdiff -u -r1.1.1.5 -r0 src/share/zoneinfo/solar87 \
src/share/zoneinfo/solar88 src/share/zoneinfo/solar89
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/zoneinfo/Makefile
diff -u src/share/zoneinfo/Makefile:1.44 src/share/zoneinfo/Makefile:1.45
--- src/share/zoneinfo/Makefile:1.44 Wed Mar 6 17:32:51 2013
+++ src/share/zoneinfo/Makefile Thu Dec 26 17:09:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2013/03/06 17:32:51 christos Exp $
+# $NetBSD: Makefile,v 1.45 2013/12/26 17:09:39 apb Exp $
.include <bsd.own.mk>
@@ -11,6 +11,10 @@
# for handling POSIX-style time zone environment variables,
# change the line below (after finding the zone you want in the
# time zone files, or adding it to a time zone file).
+# (When a POSIX-style environment variable is handled, the rules in the
+# template file are used to determine "spring forward" and "fall back" days and
+# times; the environment variable itself specifies UT offsets of standard and
+# summer time.)
# Alternately, if you discover you've got the wrong time zone, you can just
# zic -p rightzone
@@ -44,11 +48,9 @@ YDATA= africa antarctica asia australas
europe northamerica southamerica pacificnew etcetera factory \
backward
NDATA= systemv
-SDATA= solar87 solar88 solar89
-TDATA= $(YDATA) $(NDATA) $(SDATA)
+TDATA= $(YDATA) $(NDATA)
TABDATA= iso3166.tab zone.tab
-DATA= $(YDATA) $(NDATA) $(SDATA) leapseconds # yearistype.sh
-USNO= usno1988 usno1989
+DATA= $(YDATA) $(NDATA) leapseconds # yearistype.sh
TZBUILDDIR= ${.OBJDIR}/builddir
Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.33 src/share/zoneinfo/australasia:1.34
--- src/share/zoneinfo/australasia:1.33 Fri Sep 20 20:46:01 2013
+++ src/share/zoneinfo/australasia Thu Dec 26 17:09:39 2013
@@ -496,6 +496,7 @@ Zone Pacific/Auckland 11:39:04 - LMT 186
Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1
12:45 Chatham CHA%sT
+Link Pacific/Auckland Antarctica/McMurdo
# Auckland Is
# uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers,
@@ -745,7 +746,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190
# 1886-1891; Baker was similar but exact dates are not known.
# Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
# uninhabited thereafter.
-# Howland observed Hawaii Standard Time (UTC-10:30) in 1937;
+# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
# see page 206 of Elgen M. Long and Marie K. Long,
# Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
# So most likely Howland and Baker observed Hawaii Time from 1935
@@ -758,8 +759,17 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190
# no information; was probably like Pacific/Kiritimati
# Johnston
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Pacific/Johnston -10:00 - HST
+#
+# From Paul Eggert (2013-09-03):
+# In his memoirs of June 6th to October 4, 1945
+# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
+# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
+# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and
+# confirms that Johnston kept the same time as Honolulu in summer 1945.
+# We have no better information, so for now, assume this has been true
+# indefinitely into the past.
+#
+# See 'northamerica' for Pacific/Johnston.
# Kingman
# uninhabited
Added files:
Index: src/share/zoneinfo/README
diff -u /dev/null src/share/zoneinfo/README:1.3
--- /dev/null Thu Dec 26 17:09:39 2013
+++ src/share/zoneinfo/README Thu Dec 26 17:09:39 2013
@@ -0,0 +1,64 @@
+README for the tz distribution
+
+"What time is it?" -- Richard Deacon as The King
+"Any time you want it to be." -- Frank Baxter as The Scientist
+ (from the Bell System film "About Time")
+
+The Time Zone Database (often called tz or zoneinfo) contains code and
+data that represent the history of local time for many representative
+locations around the globe. It is updated periodically to reflect
+changes made by political bodies to time zone boundaries, UTC offsets,
+and daylight-saving rules.
+
+Unless otherwise specified, all files in the tz code and data are in
+the public domain, so clarified as of 2009-05-17 by Arthur David Olson.
+The few exceptions are code derived from BSD, which uses the BSD license.
+
+Here is a recipe for acquiring, building, installing, and testing the
+tz distribution on a GNU/Linux or similar host.
+
+ mkdir tz
+ cd tz
+ wget --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
+ gzip -dc tzcode-latest.tar.gz | tar -xf -
+ gzip -dc tzdata-latest.tar.gz | tar -xf -
+
+Be sure to read the comments in "Makefile" and make any changes needed
+to make things right for your system, especially if you are using some
+platform other than GNU/Linux. Then run the following commands,
+substituting your desired installation directory for "$HOME/tzdir":
+
+ make TOPDIR=$HOME/tzdir install
+ $HOME/tzdir/etc/zdump -v America/Los_Angeles
+
+Historical local time information has been included here to:
+
+* provide a compendium of data about the history of civil time
+ that is useful even if the data are not 100% accurate;
+
+* give an idea of the variety of local time rules that have
+ existed in the past and thus an idea of the variety that may be
+ expected in the future;
+
+* provide a test of the generality of the local time rule description
+ system.
+
+The information in the time zone data files is by no means authoritative;
+the files currently do not even attempt to cover all time stamps before
+1970, and there are undoubtedly errors even for time stamps since 1970.
+If you know that the rules are different from those in a file, by all means
+feel free to change a file (and please send the changed version to
+t...@iana.org for use in the future). Europeans take note!
+
+Thanks to these Timezone Caballeros who've made major contributions to the
+time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz;
+Guy Harris; Mark Horton; John Mackin; and Bradley White. Thanks also to
+Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales
+for testing work, and to Gwillim Law for checking local mean time data.
+Thanks in particular to Arthur David Olson, the project's founder and first
+maintainer, to whom the timezone community owes the greatest debt of all.
+None of them are responsible for remaining errors.
+
+Look in <ftp://ftp.iana.org/tz/releases/> for updated versions of these files.
+
+Please send comments or information to t...@iana.org.
