Module Name:    src
Committed By:   riz
Date:           Tue Nov 20 23:29:35 UTC 2012

Modified Files:
        src/doc [netbsd-6-0]: 3RDPARTY
        src/share/zoneinfo [netbsd-6-0]: africa asia australasia europe
            northamerica southamerica

Log Message:
doc/3RDPARTY                                    patch
share/zoneinfo/africa                           patch
share/zoneinfo/asia                             patch
share/zoneinfo/australasia                      patch
share/zoneinfo/europe                           patch
share/zoneinfo/northamerica                     patch
share/zoneinfo/southamerica                     patch

        Import tzdata2012j from
        ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz
        Changes from tzdata2012h to tzdata2012i:
        Changes from tzdata2012h to tzdata2012i:
                Cuba switches from DST on 4 Nov 2012 at 01:00. (Thanks to 
Steffen
                Thorsen.)
        Changes from tzdata2012i to tzdata2012j:
                Libya moved to CET this weekend, but with DST planned next year.
                (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.)
        Various fixes to documentation and commentary.
        [apb, ticket #677]


To generate a diff of this commit:
cvs rdiff -u -r1.909.2.14.2.2 -r1.909.2.14.2.3 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.30.4.1 -r1.1.1.30.4.1.4.1 src/share/zoneinfo/africa
cvs rdiff -u -r1.1.1.50.4.3.4.2 -r1.1.1.50.4.3.4.3 src/share/zoneinfo/asia
cvs rdiff -u -r1.23.4.4.2.1 -r1.23.4.4.2.2 src/share/zoneinfo/australasia
cvs rdiff -u -r1.1.1.44.4.3 -r1.1.1.44.4.3.4.1 src/share/zoneinfo/europe
cvs rdiff -u -r1.1.1.49.4.4 -r1.1.1.49.4.4.4.1 \
    src/share/zoneinfo/northamerica
cvs rdiff -u -r1.1.1.46.4.3.4.1 -r1.1.1.46.4.3.4.2 \
    src/share/zoneinfo/southamerica

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.909.2.14.2.2 src/doc/3RDPARTY:1.909.2.14.2.3
--- src/doc/3RDPARTY:1.909.2.14.2.2	Wed Oct 31 16:26:59 2012
+++ src/doc/3RDPARTY	Tue Nov 20 23:29:34 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.909.2.14.2.2 2012/10/31 16:26:59 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.909.2.14.2.3 2012/11/20 23:29:34 riz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1143,8 +1143,8 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2011i / tzdata2012h
-Current Vers:	tzcode2012h / tzdata2012h
+Version:	tzcode2011i / tzdata2012j
+Current Vers:	tzcode2012j / tzdata2012j
 Maintainer:	Paul Eggert <egg...@cs.ucla.edu>
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/share/zoneinfo/africa
diff -u src/share/zoneinfo/africa:1.1.1.30.4.1 src/share/zoneinfo/africa:1.1.1.30.4.1.4.1
--- src/share/zoneinfo/africa:1.1.1.30.4.1	Tue Jul 31 08:48:09 2012
+++ src/share/zoneinfo/africa	Tue Nov 20 23:29:34 2012
@@ -4,7 +4,7 @@
 
 # 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
-# t...@elsie.nci.nih.gov for general use in the future).
+# t...@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 #
@@ -424,6 +424,20 @@ Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
 
 # Libya
 
+# From Even Scharning (2012-11-10):
+# Libya set their time one hour back at 02:00 on Saturday November 10.
+# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
+# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
+#
+# Steffen Thorsen forwarded a translation (2012-11-10) in
+# http://mm.icann.org/pipermail/tz/2012-November/018451.html
+#
+# From Tim Parenti (2012-11-11):
+# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
+# The DST rules planned for 2013 and onward roughly mirror those of Europe
+# (either two days before them or five days after them, so as to fall on
+# lastFri instead of lastSun).
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
 Rule	Libya	1952	only	-	Jan	 1	0:00	0	-
@@ -438,17 +452,21 @@ Rule	Libya	1986	only	-	Apr	 4	0:00	1:00	
 Rule	Libya	1986	only	-	Oct	 3	0:00	0	-
 Rule	Libya	1987	1989	-	Apr	 1	0:00	1:00	S
 Rule	Libya	1987	1989	-	Oct	 1	0:00	0	-
+Rule	Libya	1997	only	-	Apr	 4	0:00	1:00	S
+Rule	Libya	1997	only	-	Oct	 4	0:00	0	-
+Rule	Libya	2013	max	-	Mar	lastFri	1:00	1:00	S
+Rule	Libya	2013	max	-	Oct	lastFri	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			1:00	Libya	CE%sT	1959
 			2:00	-	EET	1982
 			1:00	Libya	CE%sT	1990 May  4
-# The following entries are from Shanks & Pottenger;
+# The 1996 and 1997 entries are from Shanks & Pottenger;
 # the IATA SSIM data contain some obvious errors.
 			2:00	-	EET	1996 Sep 30
-			1:00	-	CET	1997 Apr  4
-			1:00	1:00	CEST	1997 Oct  4
-			2:00	-	EET
+			1:00	Libya	CE%sT	1997 Oct  4
+			2:00	-	EET	2012 Nov 10 2:00
+			1:00	Libya	CE%sT
 
 # Madagascar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

Index: src/share/zoneinfo/asia
diff -u src/share/zoneinfo/asia:1.1.1.50.4.3.4.2 src/share/zoneinfo/asia:1.1.1.50.4.3.4.3
--- src/share/zoneinfo/asia:1.1.1.50.4.3.4.2	Wed Oct 31 16:26:59 2012
+++ src/share/zoneinfo/asia	Tue Nov 20 23:29:34 2012
@@ -4,7 +4,7 @@
 
 # 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
-# t...@elsie.nci.nih.gov for general use in the future).
+# t...@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 #
@@ -1199,12 +1199,11 @@ Rule	Zion	2012	only	-	Mar	Fri>=26	2:00	1
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
 
 # From Ephraim Silverberg (2012-10-18):
-
 # Yesterday, the Interior Ministry Committee, after more than a year
 # past, approved sending the proposed June 2011 changes to the Time
 # Decree Law back to the Knesset for second and third (final) votes
 # before the upcoming elections on Jan. 22, 2013.  Hence, although the
-# changes are not yet law, they are expected to be so before Februray 2013.
+# changes are not yet law, they are expected to be so before February 2013.
 #
 # As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March.
 # DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the
@@ -1212,6 +1211,10 @@ Rule	Zion	2012	only	-	Sep	23	2:00	0	S
 # later (i.e. at 02:00 the first Monday after October 2).
 # [Rosh Hashana holidays are factored in until 2100.]
 
+# From Ephraim Silverberg (2012-11-05):
+# The Knesset passed today (in second and final readings) the amendment to the
+# Time Decree Law making the changes ... law.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	2013	max	-	Mar	Fri>=23	2:00	1:00	D
 Rule	Zion	2013	2026	-	Oct	Sun>=2	2:00	0	S
@@ -2049,8 +2052,7 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # occurred before our cutoff date of 1970.
 # However, as we get more information, we may need to add entries
 # for parts of the West Bank as they transitioned from Israel's rules
-# to Palestine's rules.  If you have more info about this, please
-# send it to t...@elsie.nci.nih.gov for incorporation into future editions.
+# to Palestine's rules.
 
 # From IINS News Service - Israel - 1998-03-23 10:38:07 Israel time,
 # forwarded by Ephraim Silverberg:

Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.23.4.4.2.1 src/share/zoneinfo/australasia:1.23.4.4.2.2
--- src/share/zoneinfo/australasia:1.23.4.4.2.1	Tue Oct 23 20:20:39 2012
+++ src/share/zoneinfo/australasia	Tue Nov 20 23:29:34 2012
@@ -780,7 +780,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # 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
-# t...@elsie.nci.nih.gov for general use in the future).
+# t...@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is

Index: src/share/zoneinfo/europe
diff -u src/share/zoneinfo/europe:1.1.1.44.4.3 src/share/zoneinfo/europe:1.1.1.44.4.3.4.1
--- src/share/zoneinfo/europe:1.1.1.44.4.3	Mon Aug 13 19:34:51 2012
+++ src/share/zoneinfo/europe	Tue Nov 20 23:29:34 2012
@@ -4,7 +4,7 @@
 
 # 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
-# t...@elsie.nci.nih.gov for general use in the future).
+# t...@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is

Index: src/share/zoneinfo/northamerica
diff -u src/share/zoneinfo/northamerica:1.1.1.49.4.4 src/share/zoneinfo/northamerica:1.1.1.49.4.4.4.1
--- src/share/zoneinfo/northamerica:1.1.1.49.4.4	Mon Aug 13 19:34:52 2012
+++ src/share/zoneinfo/northamerica	Tue Nov 20 23:29:34 2012
@@ -6,7 +6,7 @@
 
 # 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
-# t...@elsie.nci.nih.gov for general use in the future).
+# t...@iana.org for general use in the future).
 
 # From Paul Eggert (1999-03-22):
 # A reliable and entertaining source about time zones is
@@ -2797,6 +2797,13 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1
 # http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
 # </a>
 
+# From Steffen Thorsen (2012-11-03):
+# Radio Reloj and many other sources report that Cuba is changing back
+# to standard time on 2012-11-04:
+# http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-regira-horario-normal-en-cuba-desde-el-domingo-cuatro-de-noviembre
+# From Paul Eggert (2012-11-03):
+# For now, assume the future rule is first Sunday in November.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
 Rule	Cuba	1928	only	-	Oct	10	0:00	0	S
@@ -2834,7 +2841,7 @@ Rule	Cuba	2009	2010	-	Mar	Sun>=8	0:00s	1
 Rule	Cuba	2011	only	-	Mar	Sun>=15	0:00s	1:00	D
 Rule	Cuba	2011	only	-	Nov	13	0:00s	0	S
 Rule	Cuba	2012	only	-	Apr	1	0:00s	1:00	D
-Rule	Cuba	2012	max	-	Oct	lastSun	0:00s	0	S
+Rule	Cuba	2012	max	-	Nov	Sun>=1	0:00s	0	S
 Rule	Cuba	2013	max	-	Mar	Sun>=8	0:00s	1:00	D
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

Index: src/share/zoneinfo/southamerica
diff -u src/share/zoneinfo/southamerica:1.1.1.46.4.3.4.1 src/share/zoneinfo/southamerica:1.1.1.46.4.3.4.2
--- src/share/zoneinfo/southamerica:1.1.1.46.4.3.4.1	Wed Oct 31 16:27:00 2012
+++ src/share/zoneinfo/southamerica	Tue Nov 20 23:29:35 2012
@@ -4,7 +4,7 @@
 
 # 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
-# t...@elsie.nci.nih.gov for general use in the future).
+# t...@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is

Reply via email to