--- a/components/timezone/README Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/README Fri Aug 10 17:42:31 2012 -0700
@@ -6,9 +6,9 @@
used with the zoneinfo source files to create additional data files.
The zoneinfo files track the Olson public source provided at
-ftp://munnari.oz.au/pub/, therefore zoneinfo files may be added and
+ftp://ftp.iana.org/tz/releases/, therefore zoneinfo files may be added and
removed as the Solaris source is updated. The current Solaris release of
-the zoneinfo files is based on tzdata2012c.tar.gz.
+the zoneinfo files is based on tzdata2012d.tar.gz.
The /usr/share/lib/zoneinfo/GMT[+-]* timezones listed below have been
removed from the release. Replace usage of the
--- a/components/timezone/africa Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/africa Fri Aug 10 17:42:31 2012 -0700
@@ -1,5 +1,4 @@
# <pre>
-# @(#)africa 8.35
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -238,7 +237,7 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# </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 @@
# 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):
@@ -799,6 +798,23 @@
# "...à 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
@@ -826,6 +842,8 @@
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
@@ -854,7 +872,7 @@
# 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.
--- a/components/timezone/antarctica Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/antarctica Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/asia Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/asia Fri Aug 10 17:42:31 2012 -0700
@@ -1,5 +1,4 @@
# <pre>
-# @(#)asia 8.73
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
--- a/components/timezone/australasia Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/australasia Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/backward Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/backward Fri Aug 10 17:42:31 2012 -0700
@@ -1,7 +1,6 @@
-# Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
# <pre>
-# @(#)backward 8.11
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
--- a/components/timezone/country.tab Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/country.tab Fri Aug 10 17:42:31 2012 -0700
@@ -1,10 +1,9 @@
#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
#
# ISO 3166 alpha-2 country codes
#
# <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
--- a/components/timezone/etcetera Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/etcetera Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/europe Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/europe Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/factory Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/factory Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/northamerica Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/northamerica Fri Aug 10 17:42:31 2012 -0700
@@ -1,5 +1,4 @@
# <pre>
-# @(#)northamerica 8.54
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
--- a/components/timezone/pacificnew Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/pacificnew Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/solar87 Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/solar87 Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/solar88 Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/solar88 Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/solar89 Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/solar89 Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/southamerica Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/southamerica Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/systemv Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/systemv Fri Aug 10 17:42:31 2012 -0700
@@ -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.
--- a/components/timezone/zone.tab.txt Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/zone.tab.txt Fri Aug 10 17:42:31 2012 -0700
@@ -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.
#
--- a/components/timezone/zone_sun.tab Tue Jul 17 00:25:22 2012 +0200
+++ b/components/timezone/zone_sun.tab Fri Aug 10 17:42:31 2012 -0700
@@ -1,7 +1,6 @@
# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
#
# <pre>
-# @(#)zone.tab 8.55
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#