summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-01-28 10:25:25 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-01-28 10:25:25 -0800
commit59a64736eca8db3b2419d1ae4eaa066c7b355ae4 (patch)
tree8bb6848fd99b5b32bbfa63bf7276d1c11398b0be
parent9835e233254f46727a766c9b72f456eaeda2a0f3 (diff)
downloadtz-59a64736eca8db3b2419d1ae4eaa066c7b355ae4.tar.gz
Revert America/FCP_QRoo change
There are too many unanswered questions about it.
-rw-r--r--NEWS6
-rw-r--r--northamerica20
-rw-r--r--zone.tab3
-rw-r--r--zone1970.tab3
4 files changed, 4 insertions, 28 deletions
diff --git a/NEWS b/NEWS
index 1de5a71..b6b94a7 100644
--- a/NEWS
+++ b/NEWS
@@ -2,16 +2,12 @@ News for the tz database
Unreleased, experimental changes
- Changes affecting current and future time stamps
+ Changes affecting future time stamps
The Mexican state of Quintana Roo, represented by America/Cancun,
will shift from Central Time with DST to Eastern Time without DST
on 2015-02-01 at 02:00. (Thanks to Steffen Thorsen and Gwillim Law.)
- A new zone America/FCP_QRoo covers portions of Quintana Roo which
- have observed Eastern Time without DST since 1998. (Thanks to
- Gwillim Law and Tim Parenti.)
-
New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
(Thanks to Tim Parenti.)
diff --git a/northamerica b/northamerica
index ae1290e..cb94c5e 100644
--- a/northamerica
+++ b/northamerica
@@ -2314,19 +2314,6 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
# time..."
#
# Also, the new zone will not use DST.
-#
-# From Tim Parenti (2015-01-18):
-# A new zone for Felipe Carrillo Puerto (FCP) is needed which apparently did not
-# switch to Central Time on 1998-08-02 with Cancún and the rest of Quintana
-# Roo state. Assume that the reference to FCP "refus[ing] to change its time
-# zone" since then refers to a refusal to observe DST, putting it out of sync
-# with Cancún during the winter. Since there are multiple places within
-# Mexico referred to as Felipe Carrillo Puerto or Quintana Roo, use
-# America/FCP_QRoo to refer to the municipio of FCP inside the state of QRoo,
-# abbreviating to stay under 14 characters.
-#
-# Since Cancún is shifting to EST without DST on 2015-02-01, this brings these
-# regions back into synchronicity with each other.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
@@ -2344,17 +2331,12 @@ Rule Mexico 2001 only - Sep lastSun 2:00 0 S
Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D
Rule Mexico 2002 max - Oct lastSun 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-# Most of Quintana Roo state; represented by Cancún
+# Quintana Roo; represented by Cancún
Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56
-6:00 - CST 1981 Dec 23
-5:00 Mexico E%sT 1998 Aug 2 2:00
-6:00 Mexico C%sT 2015 Feb 1 2:00
-5:00 - EST
-# Felipe Carrillo Puerto municipio (within Quintana Roo state)
-Zone America/FCP_QRoo -5:52:11 - LMT 1922 Jan 1 0:07:49
- -6:00 - CST 1981 Dec 23
- -5:00 Mexico E%sT 1998 Aug 2 2:00
- -5:00 - EST
# Campeche, Yucatán; represented by Mérida
Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
-6:00 - CST 1981 Dec 23
diff --git a/zone.tab b/zone.tab
index 403a204..f418e7f 100644
--- a/zone.tab
+++ b/zone.tab
@@ -274,8 +274,7 @@ MU -2010+05730 Indian/Mauritius
MV +0410+07330 Indian/Maldives
MW -1547+03500 Africa/Blantyre
MX +1924-09909 America/Mexico_City Central Time - most locations
-MX +2105-08646 America/Cancun Eastern Standard Time - most of Quintana Roo
-MX +1935-08803 America/FCP_QRoo Eastern Standard Time - Felipe Carrillo Puerto, Quintana Roo
+MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo
MX +2058-08937 America/Merida Central Time - Campeche, Yucatan
MX +2540-10019 America/Monterrey Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
MX +2550-09730 America/Matamoros US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
diff --git a/zone1970.tab b/zone1970.tab
index b28a693..5da0200 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -233,8 +233,7 @@ MT +3554+01431 Europe/Malta
MU -2010+05730 Indian/Mauritius
MV +0410+07330 Indian/Maldives
MX +1924-09909 America/Mexico_City Central Time - most locations
-MX +2105-08646 America/Cancun Eastern Standard Time - most of Quintana Roo
-MX +1935-08803 America/FCP_QRoo Eastern Standard Time - Felipe Carrillo Puerto, Quintana Roo
+MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo
MX +2058-08937 America/Merida Central Time - Campeche, Yucatán
MX +2540-10019 America/Monterrey Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
MX +2550-09730 America/Matamoros US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border