[src/netbsd-6]: src Pull up following revision(s) (requested by apb in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/3f594ff7118c
branches:  netbsd-6
changeset: 774612:3f594ff7118c
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Sep 30 18:26:24 2012 +0000

description:
Pull up following revision(s) (requested by apb in ticket #578):
        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.

diffstat:

 doc/3RDPARTY               |   6 +++---
 share/zoneinfo/australasia |  14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 6676cd087dce -r 3f594ff7118c doc/3RDPARTY
--- a/doc/3RDPARTY      Mon Sep 17 19:06:24 2012 +0000
+++ b/doc/3RDPARTY      Sun Sep 30 18:26:24 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: 3RDPARTY,v 1.909.2.13 2012/08/13 20:19:20 riz Exp $
+#      $NetBSD: 3RDPARTY,v 1.909.2.14 2012/09/30 18:26:24 bouyer 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 @@
 Added changes from a5 -> a12 manually.
 
 Package:       tz
-Version:       tzcode2011i / tzdata2012e
-Current Vers:  tzcode2012e / tzdata2012e
+Version:       tzcode2011i / tzdata2012f
+Current Vers:  tzcode2012f / tzdata2012f
 Maintainer:    Arthur David Olson <ado%elsie.nci.nih.gov@localhost>
 Maintainer:    Robert Elz <kre%munnari.oz.au@localhost>
 Archive Site:  ftp://elsie.nci.nih.gov/pub/
diff -r 6676cd087dce -r 3f594ff7118c share/zoneinfo/australasia
--- a/share/zoneinfo/australasia        Mon Sep 17 19:06:24 2012 +0000
+++ b/share/zoneinfo/australasia        Sun Sep 30 18:26:24 2012 +0000
@@ -321,15 +321,23 @@
 # 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