Blob Blame Raw
From ddc67c5c9aac03778d99090211437d4b869e5742 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 28 Oct 2018 12:10:43 -0700
Subject: [PROPOSED] Correct tm_dst during Morocco transition

(Thanks to Michael Deckers and Matt Johnson.)
* NEWS: Mention this, and correct the misleading 2018g notes
without misrepresenting the 2018g change.
* africa (Africa/Casablanca, Africa/El_Aaiun):
Transition was at 2018-10-28 03:00, not 2018-10-27.
---
 NEWS   | 15 ++++++++++++---
 africa |  8 ++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index d4cb723..f9bbc0c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,23 @@
 News for the tz database
 
+Unreleased, experimental changes
+
+  Changes to past tm_isdst flags
+
+    For the recent Morocco change, the tm_isdst flag should be 1 from
+    2018-10-27 00:00 to 2018-10-28 03:00.  (Thanks to Michael Deckers.)
+    Give a URL to the official decree.  (Thanks to .)
+
+
 Release 2018g - 2018-10-26 22:22:45 -0700
 
   Briefly:
-    Morocco switches to permanent +01 on 2018-10-27.
+    Morocco switches to permanent +01 on 2018-10-28.
 
   Changes to future timestamps
 
-    Morocco switches from +00/+01 to permanent +01 effective 2018-10-27,
-    so its clocks will not fall back on 2018-10-28 as previously scheduled.
+    Morocco switches from +00/+01 to permanent +01 effective 2018-10-28,
+    so its clocks will not fall back as previously scheduled.
     (Thanks to Mohamed Essedik Najd and Brian Inglis.)
 
   Changes to code
diff --git a/africa b/africa
index a26b91b..2a15e1e 100644
--- a/africa
+++ b/africa
@@ -847,8 +847,8 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
 # From Mohamed Essedik Najd (2018-10-26):
 # Today, a Moroccan government council approved the perpetual addition
 # of 60 minutes to the regular Moroccan timezone.
-# From Brian Inglis (2018-10-26):
-# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le
+# From Matt Johnson (2018-10-28):
+# http://www.sgg.gov.ma/Portals/1/BO/2018/BO_6720-bis_Ar.pdf
 
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	-
@@ -897,7 +897,7 @@ Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	-
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	+00/+01	1984 Mar 16
 			 1:00	-	+01	1986
-			 0:00	Morocco	+00/+01	2018 Oct 27
+			 0:00	Morocco	+00/+01	2018 Oct 28  3:00
 			 1:00	-	+01
 
 # Western Sahara
@@ -913,7 +913,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 
 Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El AaiĂșn
 			-1:00	-	-01	1976 Apr 14
-			 0:00	Morocco	+00/+01	2018 Oct 27
+			 0:00	Morocco	+00/+01	2018 Oct 28  3:00
 			 1:00	-	+01
 
 # Mozambique
-- 
2.17.1