From 8eadffdb425e5042edf1a99cbf8fdfcec05ec50d Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 20 Jul 2012 10:22:22 +0200 Subject: [PATCH] Sync zoneinfo database with tzdata2012d from ftp://ftp.iana.org/tz/releases * Removes the SCCS IDs * africa: Morocco does not observe DST from Jul 20 03:00 to Aug 20 02:00. --- share/zoneinfo/README | 11 ++++++----- share/zoneinfo/Theory | 1 - share/zoneinfo/africa | 20 +++++++++++++++++++- share/zoneinfo/antarctica | 1 - share/zoneinfo/asia | 1 - share/zoneinfo/australasia | 1 - share/zoneinfo/backward | 1 - share/zoneinfo/etcetera | 1 - share/zoneinfo/europe | 1 - share/zoneinfo/iso3166.tab | 1 - share/zoneinfo/leapseconds | 1 - share/zoneinfo/northamerica | 1 - share/zoneinfo/southamerica | 1 - share/zoneinfo/systemv | 1 - share/zoneinfo/yearistype.sh | 2 -- share/zoneinfo/zone.tab | 1 - 16 files changed, 25 insertions(+), 21 deletions(-) diff --git a/share/zoneinfo/README b/share/zoneinfo/README index a2659ab954..091384c873 100644 --- a/share/zoneinfo/README +++ b/share/zoneinfo/README @@ -1,4 +1,5 @@ -@(#)README 8.4 +README for the tz distribution + This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. @@ -40,9 +41,9 @@ tz distribution on a GNU/Linux or similar host. mkdir tz cd tz - wget 'ftp://munnari.oz.au/pub/tz*.tar.gz' - gzip -dc tzcode*.tar.gz | tar -xf - - gzip -dc tzdata*.tar.gz | tar -xf - + wget --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz' + gzip -dc tzcode-latest.tar.gz | tar -xf - + gzip -dc tzdata-latest.tar.gz | tar -xf - Be sure to read the comments in "Makefile" and make any changes needed to make things right for your system, especially if you are using some @@ -80,7 +81,7 @@ Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales for testing work, and to Gwillim Law for checking local mean time data. None of them are responsible for remaining errors. -Look in the ~ftp/pub directory of munnari.oz.au +Look in for updated versions of these files. Please send comments or information to tz@iana.org. diff --git a/share/zoneinfo/Theory b/share/zoneinfo/Theory index be03e4a48d..e442bcdccf 100644 --- a/share/zoneinfo/Theory +++ b/share/zoneinfo/Theory @@ -1,4 +1,3 @@ -@(#)Theory 8.6 This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. diff --git a/share/zoneinfo/africa b/share/zoneinfo/africa index dd7e771291..1c6e5203f1 100644 --- a/share/zoneinfo/africa +++ b/share/zoneinfo/africa @@ -1,5 +1,4 @@ # 
-# @(#)africa	8.35
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -799,6 +798,23 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 # "...à 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:
+# 
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
+# 
+#
+# 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	-	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
diff --git a/share/zoneinfo/antarctica b/share/zoneinfo/antarctica
index 2fca366d69..f55cbde05a 100644
--- a/share/zoneinfo/antarctica
+++ b/share/zoneinfo/antarctica
@@ -1,5 +1,4 @@
 # 
-# @(#)antarctica	8.10
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/asia b/share/zoneinfo/asia
index e844971637..a02e10924e 100644
--- a/share/zoneinfo/asia
+++ b/share/zoneinfo/asia
@@ -1,5 +1,4 @@
 # 
-# @(#)asia	8.73
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/australasia b/share/zoneinfo/australasia
index b81b8d3f14..dfadfa9a43 100644
--- a/share/zoneinfo/australasia
+++ b/share/zoneinfo/australasia
@@ -1,5 +1,4 @@
 # 
-# @(#)australasia	8.30
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/backward b/share/zoneinfo/backward
index b2d837d2f8..dc7769fb1f 100644
--- a/share/zoneinfo/backward
+++ b/share/zoneinfo/backward
@@ -1,5 +1,4 @@
 # 
-# @(#)backward	8.11
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/etcetera b/share/zoneinfo/etcetera
index f8eb4b58e6..a9ff729383 100644
--- a/share/zoneinfo/etcetera
+++ b/share/zoneinfo/etcetera
@@ -1,5 +1,4 @@
 # 
-# @(#)etcetera	8.3
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/europe b/share/zoneinfo/europe
index 148f3f26bb..5d2acc5a7c 100644
--- a/share/zoneinfo/europe
+++ b/share/zoneinfo/europe
@@ -1,5 +1,4 @@
 # 
-# @(#)europe	8.41
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/iso3166.tab b/share/zoneinfo/iso3166.tab
index 950c40f1db..b952ca1c59 100644
--- a/share/zoneinfo/iso3166.tab
+++ b/share/zoneinfo/iso3166.tab
@@ -1,5 +1,4 @@
 # 
-# @(#)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
diff --git a/share/zoneinfo/leapseconds b/share/zoneinfo/leapseconds
index 2669b1cf8c..5b5c70eb6b 100644
--- a/share/zoneinfo/leapseconds
+++ b/share/zoneinfo/leapseconds
@@ -1,5 +1,4 @@
 # 
-# @(#)leapseconds	8.13
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/northamerica b/share/zoneinfo/northamerica
index 0096d59401..1f784e0523 100644
--- a/share/zoneinfo/northamerica
+++ b/share/zoneinfo/northamerica
@@ -1,5 +1,4 @@
 # 
-# @(#)northamerica	8.54
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/southamerica b/share/zoneinfo/southamerica
index cb54fd736c..ab4d14d0e1 100644
--- a/share/zoneinfo/southamerica
+++ b/share/zoneinfo/southamerica
@@ -1,5 +1,4 @@
 # 
-# @(#)southamerica	8.53
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/systemv b/share/zoneinfo/systemv
index 767388d6aa..e651e8540d 100644
--- a/share/zoneinfo/systemv
+++ b/share/zoneinfo/systemv
@@ -1,5 +1,4 @@
 # 
-# @(#)systemv	8.2
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/share/zoneinfo/yearistype.sh b/share/zoneinfo/yearistype.sh
index 66dbf89a2b..bdc6e58328 100644
--- a/share/zoneinfo/yearistype.sh
+++ b/share/zoneinfo/yearistype.sh
@@ -3,8 +3,6 @@
 : '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
diff --git a/share/zoneinfo/zone.tab b/share/zoneinfo/zone.tab
index d0c2425376..6bda8266ba 100644
--- a/share/zoneinfo/zone.tab
+++ b/share/zoneinfo/zone.tab
@@ -1,5 +1,4 @@
 # 
-# @(#)zone.tab	8.55
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-- 
2.41.0