Module Name: src
Committed By: martin
Date: Tue Jul 31 08:48:10 UTC 2012
Modified Files:
src/doc [netbsd-6]: 3RDPARTY
src/share/zoneinfo [netbsd-6]: africa antarctica asia australasia
backward etcetera europe factory iso3166.tab leapseconds
northamerica pacificnew solar87 solar88 solar89 southamerica
systemv yearistype.sh zone.tab
Log Message:
Pullup the import tzdata2012d
from ftp://ftp.iana.org/tz/releases/tzdata2012d.tar.gz
Major changes from tzdata2011b to tzdata2011c:
africa
Summer time changes for Morocco (to start late April 2012)
asia
Changes for 2012 for Gaza & the West Bank (Hebron) and Syria
northamerica
Haiti following US/Canada rules for 2012 (and we're assuming,
for now anyway, for the future).
Major changes from tzdata2011c to tzdata2011d:
Morocco does not observe DST from Jul 20 03:00 to
Aug 20 02:00 [2012].
Infrastructure changes to accommodate how the tz
code and data are released on IANA.
[#455, via patch, requested by apb]
To generate a diff of this commit:
cvs rdiff -u -r1.909.2.8 -r1.909.2.9 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.30 -r1.1.1.30.4.1 src/share/zoneinfo/africa
cvs rdiff -u -r1.1.1.19.4.1 -r1.1.1.19.4.2 src/share/zoneinfo/antarctica
cvs rdiff -u -r1.1.1.50.4.1 -r1.1.1.50.4.2 src/share/zoneinfo/asia
cvs rdiff -u -r1.23.4.1 -r1.23.4.2 src/share/zoneinfo/australasia
cvs rdiff -u -r1.1.1.24 -r1.1.1.24.4.1 src/share/zoneinfo/backward
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.4.1 src/share/zoneinfo/etcetera
cvs rdiff -u -r1.1.1.44.4.1 -r1.1.1.44.4.2 src/share/zoneinfo/europe
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.8.1 src/share/zoneinfo/factory \
src/share/zoneinfo/pacificnew src/share/zoneinfo/solar87 \
src/share/zoneinfo/solar88 src/share/zoneinfo/solar89
cvs rdiff -u -r1.1.1.19 -r1.1.1.19.4.1 src/share/zoneinfo/iso3166.tab
cvs rdiff -u -r1.1.1.18.4.1 -r1.1.1.18.4.2 src/share/zoneinfo/leapseconds
cvs rdiff -u -r1.1.1.49.4.2 -r1.1.1.49.4.3 src/share/zoneinfo/northamerica
cvs rdiff -u -r1.1.1.46.4.1 -r1.1.1.46.4.2 src/share/zoneinfo/southamerica
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.8.1 src/share/zoneinfo/systemv
cvs rdiff -u -r1.6 -r1.6.42.1 src/share/zoneinfo/yearistype.sh
cvs rdiff -u -r1.1.1.39.4.2 -r1.1.1.39.4.3 src/share/zoneinfo/zone.tab
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.8 src/doc/3RDPARTY:1.909.2.9
--- src/doc/3RDPARTY:1.909.2.8 Wed Jun 13 19:28:55 2012
+++ src/doc/3RDPARTY Tue Jul 31 08:48:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.909.2.8 2012/06/13 19:28:55 riz Exp $
+# $NetBSD: 3RDPARTY,v 1.909.2.9 2012/07/31 08:48:09 martin Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -1144,7 +1144,7 @@ Added changes from a5 -> a12 manually.
Package: tz
Version: tzcode2012b / tzdata2012b
-Current Vers: tzcode2011i / tzdata2012b
+Current Vers: tzcode2012c / tzdata2012d
Maintainer: Arthur David Olson <[email protected]>
Maintainer: Robert Elz <[email protected]>
Archive Site: ftp://elsie.nci.nih.gov/pub/
Index: src/share/zoneinfo/africa
diff -u src/share/zoneinfo/africa:1.1.1.30 src/share/zoneinfo/africa:1.1.1.30.4.1
--- src/share/zoneinfo/africa:1.1.1.30 Mon Oct 10 19:14:52 2011
+++ src/share/zoneinfo/africa Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)africa 8.33
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -238,7 +237,7 @@ Rule Egypt 2006 only - Sep 21 23:00s 0 -
# I received a mail from an airline which says that the daylight
# saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
-# http://www.nentjes.info/Bill/bill5.htm
+# http://www.nentjes.info/Bill/bill5.htm
# http://www.timeanddate.com/worldclock/city.html?n=53
# From Steffen Thorsen (2007-09-04): The official information...:
# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
@@ -292,18 +291,18 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s
# in September.
# From Steffen Thorsen (2009-08-11):
-# We have been able to confirm the August change with the Egyptian Cabinet
+# We have been able to confirm the August change with the Egyptian Cabinet
# Information and Decision Support Center:
# <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html";>
# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
# </a>
-#
+#
# The Middle East News Agency
# <a href="http://www.mena.org.eg/index.aspx";>
# http://www.mena.org.eg/index.aspx
# </a>
# also reports "Egypt starts winter time on August 21"
-# today in article numbered "71, 11/08/2009 12:25 GMT."
+# today in article numbered "71, 11/08/2009 12:25 GMT."
# Only the title above is available without a subscription to their service,
# and can be found by searching for "winter" in their search engine
# (at least today).
@@ -482,7 +481,7 @@ Zone Africa/Nouakchott -1:03:48 - LMT 19
# From Steffen Thorsen (2008-06-25):
# Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial
# basis....
-# It seems that Mauritius observed daylight saving time from 1982-10-10 to
+# It seems that Mauritius observed daylight saving time from 1982-10-10 to
# 1983-03-20 as well, but that was not successful....
# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
@@ -506,12 +505,12 @@ Zone Africa/Nouakchott -1:03:48 - LMT 19
# than previously announced (2008-11-01 to 2009-03-31). The new start
# date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
# given, but it is probably at either 2 or 3 wall clock time).
-#
-# A little strange though, since the article says that they moved the date
-# to align itself with Europe and USA which also change time on that date,
-# but that means they have not paid attention to what happened in
-# USA/Canada last year (DST ends first Sunday in November). I also wonder
-# why that they end on a Friday, instead of aligning with Europe which
+#
+# A little strange though, since the article says that they moved the date
+# to align itself with Europe and USA which also change time on that date,
+# but that means they have not paid attention to what happened in
+# USA/Canada last year (DST ends first Sunday in November). I also wonder
+# why that they end on a Friday, instead of aligning with Europe which
# changes two days later.
# From Alex Krivenyshev (2008-07-11):
@@ -570,7 +569,7 @@ Zone Africa/Nouakchott -1:03:48 - LMT 19
# </a>
# From Arthur David Olson (2009-07-11):
-# The "mauritius-dst-will-not-repeat" wrapup includes this:
+# The "mauritius-dst-will-not-repeat" wrapup includes this:
# "The trial ended on March 29, 2009, when the clocks moved back by one hour
# at 2am (or 02:00) local time..."
@@ -664,8 +663,8 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J
# XXX--guess that it is only Morocco for now; guess only 2008 for now.
# From Steffen Thorsen (2008-08-27):
-# Morocco will change the clocks back on the midnight between August 31
-# and September 1. They originally planned to observe DST to near the end
+# Morocco will change the clocks back on the midnight between August 31
+# and September 1. They originally planned to observe DST to near the end
# of September:
#
# One article about it (in French):
@@ -768,6 +767,54 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J
# wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
# also been like that in the past.
+# From Alexander Krivenyshev (2012-03-09):
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
+# <a href="http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9";>
+# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
+# </a>
+# Governing Council adopted draft decree, that Morocco DST starts on
+# the last Sunday of March (March 25, 2012) and ends on
+# last Sunday of September (September 30, 2012)
+# except the month of Ramadan.
+# or (brief)
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco06.html";>
+# http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
+# </a>
+
+# From Arthur David Olson (2012-03-10):
+# The infomediaire.ma source indicates that the system is to be in
+# effect every year. It gives 03H00 as the "fall back" time of day;
+# it lacks a "spring forward" time of day; assume 2:00 XXX.
+# Wait on specifying the Ramadan exception for details about
+# start date, start time of day, end date, and end time of day XXX.
+
+# From Christophe Tropamer (2012-03-16):
+# Seen Morocco change again:
+# <a href="http://www.le2uminutes.com/actualite.php";>
+# http://www.le2uminutes.com/actualite.php
+# </a>
+# "...à partir du dernier dimance d'avril et non fins mars,
+# comme annoncé précédemment."
+
+# From Milamber Space Network (2012-07-17):
+# The official return to GMT is announced by the Moroccan government:
+# <a href="http://www.mmsp.gov.ma/fr/actualites.aspx?id=288";>
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
+# </a>
+#
+# Google translation, lightly edited:
+# Back to the standard time of the Kingdom (GMT)
+# Pursuant to Decree No. 2-12-126 issued on 26 Jumada (I) 1433 (April 18,
+# 2012) and in accordance with the order of Mr. President of the
+# Government No. 3-47-12 issued on 24 Sha'ban (11 July 2012), the Ministry
+# of Public Service and Administration Modernization announces the return
+# of the legal time of the Kingdom (GMT) from Friday, July 20, 2012 until
+# Monday, August 20, 2012. So the time will be delayed by 60 minutes from
+# 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes
+# August 20, 2012 from 2:00 am.
+
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Morocco 1939 only - Sep 12 0:00 1:00 S
@@ -793,6 +840,11 @@ Rule Morocco 2010 only - May 2 0:00 1:
Rule Morocco 2010 only - Aug 8 0:00 0 -
Rule Morocco 2011 only - Apr 3 0:00 1:00 S
Rule Morocco 2011 only - Jul 31 0 0 -
+Rule Morocco 2012 max - Apr lastSun 2:00 1:00 S
+Rule Morocco 2012 max - Sep lastSun 3:00 0 -
+Rule Morocco 2012 only - Jul 20 3:00 0 -
+Rule Morocco 2012 only - Aug 20 2:00 1:00 S
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco WE%sT 1984 Mar 16
@@ -820,7 +872,7 @@ Zone Africa/Maputo 2:10:20 - LMT 1903 Ma
# Forecasting Riaan van Zyl explained that the far eastern parts of
# the country are close to 40 minutes earlier in sunrise than the rest
# of the country.
-#
+#
# From Paul Eggert (2007-03-31):
# Apparently the Caprivi Strip informally observes Botswana time, but
# we have no details. In the meantime people there can use Africa/Gaborone.
Index: src/share/zoneinfo/antarctica
diff -u src/share/zoneinfo/antarctica:1.1.1.19.4.1 src/share/zoneinfo/antarctica:1.1.1.19.4.2
--- src/share/zoneinfo/antarctica:1.1.1.19.4.1 Fri Mar 2 03:32:24 2012
+++ src/share/zoneinfo/antarctica Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)antarctica 8.10
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/asia
diff -u src/share/zoneinfo/asia:1.1.1.50.4.1 src/share/zoneinfo/asia:1.1.1.50.4.2
--- src/share/zoneinfo/asia:1.1.1.50.4.1 Fri Mar 2 03:32:24 2012
+++ src/share/zoneinfo/asia Tue Jul 31 08:48:09 2012
@@ -1,4 +1,4 @@
-# @(#)asia 8.70
+# <pre>
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -2247,6 +2247,29 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
# http://www.maannews.net/eng/ViewDetails.aspx?ID=424808
# </a>
+# From Steffen Thorsen (2012-03-26):
+# Palestinian news sources tell that both Gaza and West Bank will start DST
+# on Friday (Thursday midnight, 2012-03-29 24:00).
+# Some of many sources in Arabic:
+# <a href="http://www.samanews.com/index.php?act=Show&id=122638";>
+# http://www.samanews.com/index.php?act=Show&id=122638
+# </a>
+#
+# <a href="http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html";>
+# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html
+# </a>
+#
+# Our brief summary:
+# <a href="http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html";>
+# http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
+# </a>
+
+# From Arthur David Olson (2012-03-27):
+# The timeanddate article for 2012 says that "the end date has not yet been
+# announced" and that "Last year, both...paused daylight saving time during...
+# Ramadan. It is not yet known [for] 2012."
+# For now, assume both switch back on the last Friday in September. XXX
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
@@ -2279,6 +2302,8 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
2:00 Jordan EE%sT 1999
2:00 Palestine EE%sT 2011 Apr 2 12:01
2:00 1:00 EEST 2011 Aug 1
+ 2:00 - EET 2012 Mar 30
+ 2:00 1:00 EEST 2012 Sep 28
2:00 - EET
Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
@@ -2292,6 +2317,8 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
2:00 1:00 EEST 2011 Aug 1
2:00 - EET 2011 Aug 30
2:00 1:00 EEST 2011 Sep 30 3:00
+ 2:00 - EET 2012 Mar 30
+ 2:00 1:00 EEST 2012 Sep 28 3:00
2:00 - EET
# Paracel Is
@@ -2583,10 +2610,28 @@ Rule Syria 2007 only - Nov Fri>=1 0:00
# http://sns.sy/sns/?path=news/read/11421 (Arabic)
# </a>
+# From Steffen Thorsen (2012-03-26):
+# Today, Syria's government announced that they will start DST early on Friday
+# (00:00). This is a bit earlier than the past two years.
+#
+# From Syrian Arab News Agency, in Arabic:
+# <a href="http://www.sana.sy/ara/2/2012/03/26/408215.htm";>
+# http://www.sana.sy/ara/2/2012/03/26/408215.htm
+# </a>
+#
+# Our brief summary:
+# <a href="http://www.timeanddate.com/news/time/syria-dst-2012.html";>
+# http://www.timeanddate.com/news/time/syria-dst-2012.html
+# </a>
+
+# From Arthur David Olson (2012-03-27):
+# Assume last Friday in March going forward XXX.
+
Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S
Rule Syria 2008 only - Nov 1 0:00 0 -
Rule Syria 2009 only - Mar lastFri 0:00 1:00 S
-Rule Syria 2010 max - Apr Fri>=1 0:00 1:00 S
+Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S
+Rule Syria 2012 max - Mar lastFri 0:00 1:00 S
Rule Syria 2009 max - Oct lastFri 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.23.4.1 src/share/zoneinfo/australasia:1.23.4.2
--- src/share/zoneinfo/australasia:1.23.4.1 Fri Mar 2 03:32:24 2012
+++ src/share/zoneinfo/australasia Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)australasia 8.30
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/backward
diff -u src/share/zoneinfo/backward:1.1.1.24 src/share/zoneinfo/backward:1.1.1.24.4.1
--- src/share/zoneinfo/backward:1.1.1.24 Wed Nov 2 05:15:16 2011
+++ src/share/zoneinfo/backward Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)backward 8.11
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/etcetera
diff -u src/share/zoneinfo/etcetera:1.1.1.8 src/share/zoneinfo/etcetera:1.1.1.8.4.1
--- src/share/zoneinfo/etcetera:1.1.1.8 Sun Sep 4 10:15:58 2011
+++ src/share/zoneinfo/etcetera Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)etcetera 8.3
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/europe
diff -u src/share/zoneinfo/europe:1.1.1.44.4.1 src/share/zoneinfo/europe:1.1.1.44.4.2
--- src/share/zoneinfo/europe:1.1.1.44.4.1 Fri Mar 2 03:32:24 2012
+++ src/share/zoneinfo/europe Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)europe 8.41
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/factory
diff -u src/share/zoneinfo/factory:1.1.1.4 src/share/zoneinfo/factory:1.1.1.4.8.1
--- src/share/zoneinfo/factory:1.1.1.4 Thu May 28 08:50:00 2009
+++ src/share/zoneinfo/factory Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)factory 8.2
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/pacificnew
diff -u src/share/zoneinfo/pacificnew:1.1.1.4 src/share/zoneinfo/pacificnew:1.1.1.4.8.1
--- src/share/zoneinfo/pacificnew:1.1.1.4 Thu May 28 08:50:00 2009
+++ src/share/zoneinfo/pacificnew Tue Jul 31 08:48:10 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)pacificnew 8.2
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/solar87
diff -u src/share/zoneinfo/solar87:1.1.1.4 src/share/zoneinfo/solar87:1.1.1.4.8.1
--- src/share/zoneinfo/solar87:1.1.1.4 Thu May 28 08:50:01 2009
+++ src/share/zoneinfo/solar87 Tue Jul 31 08:48:10 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)solar87 8.2
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/solar88
diff -u src/share/zoneinfo/solar88:1.1.1.4 src/share/zoneinfo/solar88:1.1.1.4.8.1
--- src/share/zoneinfo/solar88:1.1.1.4 Thu May 28 08:50:02 2009
+++ src/share/zoneinfo/solar88 Tue Jul 31 08:48:10 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)solar88 8.2
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/solar89
diff -u src/share/zoneinfo/solar89:1.1.1.4 src/share/zoneinfo/solar89:1.1.1.4.8.1
--- src/share/zoneinfo/solar89:1.1.1.4 Thu May 28 08:50:03 2009
+++ src/share/zoneinfo/solar89 Tue Jul 31 08:48:10 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)solar89 8.2
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/iso3166.tab
diff -u src/share/zoneinfo/iso3166.tab:1.1.1.19 src/share/zoneinfo/iso3166.tab:1.1.1.19.4.1
--- src/share/zoneinfo/iso3166.tab:1.1.1.19 Sun Sep 4 10:15:59 2011
+++ src/share/zoneinfo/iso3166.tab Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)iso3166.tab 8.11
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
# ISO 3166 alpha-2 country codes
Index: src/share/zoneinfo/leapseconds
diff -u src/share/zoneinfo/leapseconds:1.1.1.18.4.1 src/share/zoneinfo/leapseconds:1.1.1.18.4.2
--- src/share/zoneinfo/leapseconds:1.1.1.18.4.1 Fri Mar 2 03:32:24 2012
+++ src/share/zoneinfo/leapseconds Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)leapseconds 8.13
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/northamerica
diff -u src/share/zoneinfo/northamerica:1.1.1.49.4.2 src/share/zoneinfo/northamerica:1.1.1.49.4.3
--- src/share/zoneinfo/northamerica:1.1.1.49.4.2 Fri Mar 2 17:39:48 2012
+++ src/share/zoneinfo/northamerica Tue Jul 31 08:48:09 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)northamerica 8.53
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -2970,6 +2969,29 @@ Zone America/Guatemala -6:02:04 - LMT 19
# From Stephen Colebourne (2007-02-22):
# Some IATA info: Haiti won't be having DST in 2007.
+# From Steffen Thorsen (2012-03-11):
+# According to several news sources, Haiti will observe DST this year,
+# apparently using the same start and end date as USA/Canada.
+# So this means they have already changed their time.
+#
+# (Sources in French):
+# <a href="http://www.alterpresse.org/spip.php?article12510";>
+# http://www.alterpresse.org/spip.php?article12510
+# </a>
+# <a href="http://radiovision2000haiti.net/home/?p=13253";>
+# http://radiovision2000haiti.net/home/?p=13253
+# </a>
+#
+# Our coverage:
+# <a href="http://www.timeanddate.com/news/time/haiti-dst-2012.html";>
+# http://www.timeanddate.com/news/time/haiti-dst-2012.html
+# </a>
+
+# From Arthur David Olson (2012-03-11):
+# The alterpresse.org source seems to show a US-style leap from 2:00 a.m. to
+# 3:00 a.m. rather than the traditional Haitian jump at midnight.
+# Assume a US-style fall back as well XXX.
+# Do not yet assume that the change carries forward past 2012 XXX.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Haiti 1983 only - May 8 0:00 1:00 D
@@ -2981,6 +3003,8 @@ Rule Haiti 1988 1997 - Apr Sun>=1 1:00s
Rule Haiti 1988 1997 - Oct lastSun 1:00s 0 S
Rule Haiti 2005 2006 - Apr Sun>=1 0:00 1:00 D
Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S
+Rule Haiti 2012 only - Mar Sun>=8 2:00 1:00 D
+Rule Haiti 2012 only - Nov Sun>=1 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Port-au-Prince -4:49:20 - LMT 1890
-4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT
Index: src/share/zoneinfo/southamerica
diff -u src/share/zoneinfo/southamerica:1.1.1.46.4.1 src/share/zoneinfo/southamerica:1.1.1.46.4.2
--- src/share/zoneinfo/southamerica:1.1.1.46.4.1 Fri Mar 2 03:32:24 2012
+++ src/share/zoneinfo/southamerica Tue Jul 31 08:48:10 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)southamerica 8.53
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/systemv
diff -u src/share/zoneinfo/systemv:1.1.1.5 src/share/zoneinfo/systemv:1.1.1.5.8.1
--- src/share/zoneinfo/systemv:1.1.1.5 Thu May 28 08:50:00 2009
+++ src/share/zoneinfo/systemv Tue Jul 31 08:48:10 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)systemv 8.2
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
Index: src/share/zoneinfo/yearistype.sh
diff -u src/share/zoneinfo/yearistype.sh:1.6 src/share/zoneinfo/yearistype.sh:1.6.42.1
--- src/share/zoneinfo/yearistype.sh:1.6 Sat Sep 23 17:34:36 2006
+++ src/share/zoneinfo/yearistype.sh Tue Jul 31 08:48:10 2012
@@ -1,13 +1,11 @@
#! /bin/sh
#
-# $NetBSD: yearistype.sh,v 1.6 2006/09/23 17:34:36 kleink Exp $
+# $NetBSD: yearistype.sh,v 1.6.42.1 2012/07/31 08:48:10 martin Exp $
#
: 'This file is in the public domain, so clarified as of'
: '2006-07-17 by Arthur David Olson.'
-: '@(#)yearistype.sh 8.2'
-
case $#-$1 in
2-|2-0*|2-*[!0-9]*)
echo "$0: wild year - $1" >&2
Index: src/share/zoneinfo/zone.tab
diff -u src/share/zoneinfo/zone.tab:1.1.1.39.4.2 src/share/zoneinfo/zone.tab:1.1.1.39.4.3
--- src/share/zoneinfo/zone.tab:1.1.1.39.4.2 Fri Mar 2 17:39:47 2012
+++ src/share/zoneinfo/zone.tab Tue Jul 31 08:48:10 2012
@@ -1,5 +1,4 @@
# <pre>
-# @(#)zone.tab 8.55
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#
