Module Name: src
Committed By: bouyer
Date: Sun Sep 30 18:12:51 UTC 2012
Modified Files:
src/doc [netbsd-5]: 3RDPARTY
src/share/zoneinfo [netbsd-5]: australasia
Log Message:
Pull up following revision(s) (requested by apb in ticket #1798):
doc/3RDPARTY: revision 1.970 via patch
share/zoneinfo/australasia: revision 1.27 via patch
Merge tzdata2012f from
http://www.iana.org/time-zones/repository/releases/tzdata2012f.tar.gz
Changes from tzdata2012e to tzdata2012f:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
20 this year. (Thanks to Steffen Thorsen.)
tzcode2012f and tzdata2012f have been released. We have updated to
tzdata2012f, and there are no real changes (apart from version number)
in tzcode2012f.
To generate a diff of this commit:
cvs rdiff -u -r1.647.2.18 -r1.647.2.19 src/doc/3RDPARTY
cvs rdiff -u -r1.17.2.3 -r1.17.2.4 src/share/zoneinfo/australasia
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.647.2.18 src/doc/3RDPARTY:1.647.2.19
--- src/doc/3RDPARTY:1.647.2.18 Sat Sep 15 09:26:41 2012
+++ src/doc/3RDPARTY Sun Sep 30 18:12:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.647.2.18 2012/09/15 09:26:41 bouyer Exp $
+# $NetBSD: 3RDPARTY,v 1.647.2.19 2012/09/30 18:12:51 bouyer Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -924,8 +924,8 @@ License: BSD (4-clause)
Notes:
Package: tz
-Version: tzcode2004a / tzdata2012e
-Current Vers: tzcode2012e / tzdata2012e
+Version: tzcode2004a / tzdata2012f
+Current Vers: tzcode2012f / tzdata2012f
Maintainer: Arthur David Olson <a...@elsie.nci.nih.gov>
Maintainer: Robert Elz <k...@munnari.oz.au>
Archive Site: ftp://ftp.iana.org/tz/releases/
Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.17.2.3 src/share/zoneinfo/australasia:1.17.2.4
--- src/share/zoneinfo/australasia:1.17.2.3 Sat Sep 15 09:26:42 2012
+++ src/share/zoneinfo/australasia Sun Sep 30 18:12:51 2012
@@ -321,15 +321,23 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# The commencement of daylight saving will remain unchanged and start
# on the 23rd of October, 2011.
+# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen:
+# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate
+# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
+# October 2012 and end at 3 am on Sunday 20th January 2013.
+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
+#
+# From Paul Eggert (2012-08-31):
+# For now, guess a pattern of the penultimate Sundays in October and January.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
Rule Fiji 2009 only - Nov 29 2:00 1:00 S
Rule Fiji 2010 only - Mar lastSun 3:00 0 -
-Rule Fiji 2010 only - Oct 24 2:00 1:00 S
+Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
-Rule Fiji 2011 only - Oct 23 2:00 1:00 S
-Rule Fiji 2012 only - Jan 22 3:00 0 -
+Rule Fiji 2012 max - Jan Sun>=18 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva
12:00 Fiji FJ%sT # Fiji Time
