Update time zone data files to tzdata release 2015a.

DST law changes in Chile and Mexico (state of Quintana Roo).
Historical changes for Iceland.

diff --git a/src/timezone/data/antarctica b/src/timezone/data/antarctica
index 1deff8e4ed091c6445559cf7c0e505414d419034..ebae9940717cd83c569cf6518ee88dece30194b4 100644 (file)
--- a/src/timezone/data/antarctica
+++ b/src/timezone/data/antarctica
@@ -47,8 +47,8 @@ Rule  ChileAQ 2009    only    -       Mar     Sun>=9  3:00u   0       -
 Rule   ChileAQ 2010    only    -       Apr     Sun>=1  3:00u   0       -
 Rule   ChileAQ 2011    only    -       May     Sun>=2  3:00u   0       -
 Rule   ChileAQ 2011    only    -       Aug     Sun>=16 4:00u   1:00    S
-Rule   ChileAQ 2012    max     -       Apr     Sun>=23 3:00u   0       -
-Rule   ChileAQ 2012    max     -       Sep     Sun>=2  4:00u   1:00    S
+Rule   ChileAQ 2012    2015    -       Apr     Sun>=23 3:00u   0       -
+Rule   ChileAQ 2012    2014    -       Sep     Sun>=2  4:00u   1:00    S
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
@@ -354,9 +354,10 @@ Zone Antarctica/Rothera    0       -       zzz     1976 Dec  1
 #
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
 Zone Antarctica/Palmer 0       -       zzz     1965
-                       -4:00   ArgAQ   AR%sT   1969 Oct 5
+                       -4:00   ArgAQ   AR%sT   1969 Oct  5
                        -3:00   ArgAQ   AR%sT   1982 May
-                       -4:00   ChileAQ CL%sT
+                       -4:00   ChileAQ CL%sT   2015 Apr 26 3:00u
+                       -3:00   -       CLT
 #
 #
 # McMurdo Station, Ross Island, since 1955-12

diff --git a/src/timezone/data/asia b/src/timezone/data/asia
index 1a2bd12ad2a2f304e8ace796ba8b7d5ebb48c1de..8f33b162097dc05883107e8263d6b69b35914207 100644 (file)
--- a/src/timezone/data/asia
+++ b/src/timezone/data/asia
@@ -145,10 +145,7 @@ Zone       Asia/Baku       3:19:24 -       LMT     1924 May  2
                        4:00    Azer    AZ%sT
 
 # Bahrain
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
-Zone   Asia/Bahrain    3:22:20 -       LMT     1920     # Manamah
-                       4:00    -       GST     1972 Jun
-                       3:00    -       AST
+# See Asia/Qatar.
 
 # Bangladesh
 # From Alexander Krivenyshev (2009-05-13):
@@ -1731,9 +1728,7 @@ Zone      Asia/Pyongyang  8:23:00 -       LMT     1908 Apr  1
 ###############################################################################
 
 # Kuwait
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
-Zone   Asia/Kuwait     3:11:56 -       LMT     1950
-                       3:00    -       AST
+# See Asia/Riyadh.
 
 # Laos
 # See Asia/Bangkok.
@@ -1954,12 +1949,7 @@ Zone     Asia/Kathmandu  5:41:16 -       LMT     1920
                        5:45    -       NPT     # Nepal Time
 
 # Oman
-
-# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
-
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
-Zone   Asia/Muscat     3:54:24 -       LMT     1920
-                       4:00    -       GST
+# See Asia/Dubai.
 
 # Pakistan
 
@@ -2453,6 +2443,7 @@ Zone      Asia/Manila     -15:56:00 -     LMT     1844 Dec 31
 Zone   Asia/Qatar      3:26:08 -       LMT     1920     # Al Dawhah / Doha
                        4:00    -       GST     1972 Jun
                        3:00    -       AST
+Link Asia/Qatar Asia/Bahrain
 
 # Saudi Arabia
 #
@@ -2479,6 +2470,8 @@ Zone      Asia/Qatar      3:26:08 -       LMT     1920     # Al Dawhah / Doha
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Riyadh     3:06:52 -       LMT     1947 Mar 14
                        3:00    -       AST
+Link Asia/Riyadh Asia/Aden     # Yemen
+Link Asia/Riyadh Asia/Kuwait
 
 # Singapore
 # taken from Mok Ly Yng (2003-10-30)
@@ -2767,6 +2760,7 @@ Zone      Asia/Ashgabat   3:53:32 -       LMT     1924 May  2 # or Ashkhabad
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Dubai      3:41:12 -       LMT     1920
                        4:00    -       GST
+Link Asia/Dubai Asia/Muscat    # Oman
 
 # Uzbekistan
 # Byalokoz 1919 says Uzbekistan was 4:27:53.
@@ -2851,10 +2845,4 @@ Zone Asia/Ho_Chi_Minh    7:06:40 -       LMT     1906 Jul  1
                        7:00    -       ICT
 
 # Yemen
-
-# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
-# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
-
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
-Zone   Asia/Aden       2:59:54 -       LMT     1950
-                       3:00    -       AST
+# See Asia/Riyadh.

diff --git a/src/timezone/data/backward b/src/timezone/data/backward
index 00cbfc4164267c0632c69b7fd251b98bb17b32cb..3ceda884bdcfee687234d4228aed574cc73f69ed 100644 (file)
--- a/src/timezone/data/backward
+++ b/src/timezone/data/backward
@@ -5,7 +5,7 @@
 # and their old names.  Many names changed in late 1993.
 
 # Link TARGET                  LINK-NAME
-Link   Africa/Asmara           Africa/Asmera
+Link   Africa/Nairobi          Africa/Asmera
 Link   Africa/Abidjan          Africa/Timbuktu
 Link   America/Argentina/Catamarca     America/Argentina/ComodRivadavia
 Link   America/Adak            America/Atka

diff --git a/src/timezone/data/backzone b/src/timezone/data/backzone
index f100f8a3d719690d18f7925c26b455cd0eb36c7d..fc20ea534d3dc5407d7e8c83f28c35da788d5fc0 100644 (file)
--- a/src/timezone/data/backzone
+++ b/src/timezone/data/backzone
@@ -60,6 +60,7 @@ Zone  Africa/Asmara   2:35:32 -       LMT     1870
                        2:35:32 -       AMT     1890        # Asmara Mean Time
                        2:35:20 -       ADMT    1936 May  5 # Adis Dera MT
                        3:00    -       EAT
+Link Africa/Asmara Africa/Asmera
 
 # Mali (southern)
 Zone   Africa/Bamako   -0:32:00 -      LMT     1912
@@ -348,6 +349,17 @@ Zone Antarctica/McMurdo    0       -       zzz     1956
                        12:00   NZ      NZ%sT
 Link Antarctica/McMurdo Antarctica/South_Pole
 
+# Yemen
+# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
+# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
+Zone   Asia/Aden       2:59:54 -       LMT     1950
+                       3:00    -       AST
+
+# Bahrain
+Zone   Asia/Bahrain    3:22:20 -       LMT     1920     # Manamah
+                       4:00    -       GST     1972 Jun
+                       3:00    -       AST
+
 # India
 #
 # From Paul Eggert (2014-09-06):
@@ -403,6 +415,16 @@ Zone       Asia/Kashgar    5:03:56 -       LMT     1928     # or Kashi or Kaxgar
                        5:00    -       KAST    1980 May
                        8:00    PRC     C%sT
 
+# Kuwait
+Zone   Asia/Kuwait     3:11:56 -       LMT     1950
+                       3:00    -       AST
+
+
+# Oman
+# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
+Zone   Asia/Muscat     3:54:24 -       LMT     1920
+                       4:00    -       GST
+
 # India
 # From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
 # According to a Portuguese decree (1911-05-26)
@@ -494,7 +516,7 @@ Zone        Europe/Guernsey -0:09:19 -      LMT     1913 Jun 18
 #
 # AT4 of 1883 - The Statutory Time et cetera Act 1883 -
 # LMT Location - 54.1508N -4.4814E - Tynwald Hill ( Manx parliament )
-Zone    Europe/Isle_of_Man -0:17:55 -    LMT 1883 March 30  0:00s
+Zone Europe/Isle_of_Man        -0:17:55 -      LMT     1883 Mar 30  0:00s
                         0:00   GB-Eire %s      1968 Oct 27
                         1:00   -       BST     1971 Oct 31  2:00u
                         0:00   GB-Eire %s      1996

diff --git a/src/timezone/data/europe b/src/timezone/data/europe
index 5e78c549981fb9167eb228f28ee347ae37c2c7c0..60dfc1dce1fe2ca9d4d436fac9f7ebb44cd96c30 100644 (file)
--- a/src/timezone/data/europe
+++ b/src/timezone/data/europe
@@ -1407,35 +1407,32 @@ Zone    Europe/Budapest 1:16:20 -       LMT     1890 Oct
 # might be a reference to the Julian calendar as opposed to Gregorian, or it
 # might mean something else (???).
 #
-# From Paul Eggert (2006-03-22):
-# The Iceland Almanak, Shanks & Pottenger, and Whitman disagree on many points.
-# We go with the Almanak, except for one claim from Shanks & Pottenger, namely
-# that Reykavik was 21W57 from 1837 to 1908, local mean time before that.
+# From Paul Eggert (2014-11-22):
+# The information below is taken from the 1988 Almanak; see
+# http://www.almanak.hi.is/klukkan.html
 #
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-Rule   Iceland 1917    1918    -       Feb     19      23:00   1:00    S
+Rule   Iceland 1917    1919    -       Feb     19      23:00   1:00    S
 Rule   Iceland 1917    only    -       Oct     21       1:00   0       -
-Rule   Iceland 1918    only    -       Nov     16       1:00   0       -
+Rule   Iceland 1918    1919    -       Nov     16       1:00   0       -
+Rule   Iceland 1921    only    -       Mar     19      23:00   1:00    S
+Rule   Iceland 1921    only    -       Jun     23       1:00   0       -
 Rule   Iceland 1939    only    -       Apr     29      23:00   1:00    S
-Rule   Iceland 1939    only    -       Nov     29       2:00   0       -
+Rule   Iceland 1939    only    -       Oct     29       2:00   0       -
 Rule   Iceland 1940    only    -       Feb     25       2:00   1:00    S
-Rule   Iceland 1940    only    -       Nov      3       2:00   0       -
-Rule   Iceland 1941    only    -       Mar      2       1:00s  1:00    S
-Rule   Iceland 1941    only    -       Nov      2       1:00s  0       -
-Rule   Iceland 1942    only    -       Mar      8       1:00s  1:00    S
-Rule   Iceland 1942    only    -       Oct     25       1:00s  0       -
+Rule   Iceland 1940    1941    -       Nov     Sun>=2   1:00s  0       -
+Rule   Iceland 1941    1942    -       Mar     Sun>=2   1:00s  1:00    S
 # 1943-1946 - first Sunday in March until first Sunday in winter
 Rule   Iceland 1943    1946    -       Mar     Sun>=1   1:00s  1:00    S
-Rule   Iceland 1943    1948    -       Oct     Sun>=22  1:00s  0       -
+Rule   Iceland 1942    1948    -       Oct     Sun>=22  1:00s  0       -
 # 1947-1967 - first Sunday in April until first Sunday in winter
 Rule   Iceland 1947    1967    -       Apr     Sun>=1   1:00s  1:00    S
-# 1949 Oct transition delayed by 1 week
+# 1949 and 1967 Oct transitions delayed by 1 week
 Rule   Iceland 1949    only    -       Oct     30       1:00s  0       -
 Rule   Iceland 1950    1966    -       Oct     Sun>=22  1:00s  0       -
 Rule   Iceland 1967    only    -       Oct     29       1:00s  0       -
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
-Zone Atlantic/Reykjavik        -1:27:24 -      LMT     1837
-                       -1:27:48 -      RMT     1908 # Reykjavik Mean Time?
+Zone Atlantic/Reykjavik        -1:28   -       LMT     1908
                        -1:00   Iceland IS%sT   1968 Apr  7  1:00s
                         0:00   -       GMT
 

diff --git a/src/timezone/data/leapseconds b/src/timezone/data/leapseconds
index a8105feb8f2ae4c02ce3b35bf0a0bd9c0d6b849d..5c39e626dfe9e00f5b899bc0677d570652bd9e5d 100644 (file)
--- a/src/timezone/data/leapseconds
+++ b/src/timezone/data/leapseconds
@@ -54,3 +54,7 @@ Leap  1998    Dec     31      23:59:60        +       S
 Leap   2005    Dec     31      23:59:60        +       S
 Leap   2008    Dec     31      23:59:60        +       S
 Leap   2012    Jun     30      23:59:60        +       S
+Leap   2015    Jun     30      23:59:60        +       S
+
+#      Updated through IERS Bulletin C49
+#      File expires on:  28 December 2015

diff --git a/src/timezone/data/northamerica b/src/timezone/data/northamerica
index c91430c0337d3c70e858e3697d13c35b35ed2a5d..cb94c5e502bac1dc84b0840951e65ecb8df6a8ea 100644 (file)
--- a/src/timezone/data/northamerica
+++ b/src/timezone/data/northamerica
@@ -124,7 +124,7 @@ Rule        US      1918    1919    -       Mar     lastSun 2:00    1:00    D
 Rule   US      1918    1919    -       Oct     lastSun 2:00    0       S
 Rule   US      1942    only    -       Feb     9       2:00    1:00    W # War
 Rule   US      1945    only    -       Aug     14      23:00u  1:00    P # Peace
-Rule   US      1945    only    -       Sep     30      2:00    0       S
+Rule   US      1945    only    -       Sep     lastSun 2:00    0       S
 Rule   US      1967    2006    -       Oct     lastSun 2:00    0       S
 Rule   US      1967    1973    -       Apr     lastSun 2:00    1:00    D
 Rule   US      1974    only    -       Jan     6       2:00    1:00    D
@@ -2124,11 +2124,11 @@ Zone America/Dawson     -9:17:40 -      LMT     1900 Aug 20
 
 # Mexico
 
-# From Paul Eggert (2001-03-05):
+# From Paul Eggert (2014-12-07):
 # The Investigation and Analysis Service of the
 # Mexican Library of Congress (MLoC) has published a
 # history of Mexican local time (in Spanish)
-# http://www.cddhcu.gob.mx/bibliot/publica/inveyana/polisoc/horver/
+# http://www.diputados.gob.mx/bibliot/publica/inveyana/polisoc/horver/index.htm
 #
 # Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC.
 # (In all cases we go with the MLoC.)
@@ -2297,6 +2297,24 @@ Zone America/Dawson      -9:17:40 -      LMT     1900 Aug 20
 # efecto desde las dos horas del segundo domingo de marzo y concluirá a
 # las dos horas del primer domingo de noviembre.
 
+# From Steffen Thorsen (2014-12-08), translated by Gwillim Law:
+# The Mexican state of Quintana Roo will likely change to EST in 2015.
+#
+# http://www.unioncancun.mx/articulo/2014/12/04/medio-ambiente/congreso-aprueba-una-hora-mas-de-sol-en-qroo
+# "With this change, the time conflict that has existed between the municipios
+# of Quintana Roo and the municipio of Felipe Carrillo Puerto may come to an
+# end. The latter declared itself in rebellion 15 years ago when a time change
+# was initiated in Mexico, and since then it has refused to change its time
+# zone along with the rest of the country."
+#
+# From Steffen Thorsen (2015-01-14), translated by Gwillim Law:
+# http://sipse.com/novedades/confirman-aplicacion-de-nueva-zona-horaria-para-quintana-roo-132331.html
+# "...the new time zone will come into effect at two o'clock on the first Sunday
+# of February, when we will have to advance the clock one hour from its current
+# time..."
+#
+# Also, the new zone will not use DST.
+
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 Rule   Mexico  1939    only    -       Feb     5       0:00    1:00    D
 Rule   Mexico  1939    only    -       Jun     25      0:00    0       S
@@ -2317,7 +2335,8 @@ Rule      Mexico  2002    max     -       Oct     lastSun 2:00    0       S
 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
+                       -6:00   Mexico  C%sT    2015 Feb  1  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/src/timezone/data/southamerica b/src/timezone/data/southamerica
index bdc29c214ed6184a69183b616c0a7cac20780fe9..3ab353e329a8fe321258550fe1d291926caa4368 100644 (file)
--- a/src/timezone/data/southamerica
+++ b/src/timezone/data/southamerica
@@ -1206,6 +1206,11 @@ Zone America/Rio_Branco  -4:31:12 -      LMT     1914
 # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
 # http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
 
+# From Juan Correa (2015-01-28):
+# ... today the Ministry of Energy announced that Chile will drop DST, will keep
+# "summer time" (UTC -3 / UTC -5) all year round....
+# http://www.minenergia.cl/ministerio/noticias/generales/ministerio-de-energia-anuncia.html
+
 # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
 # 'antarctica' file.
 
@@ -1247,8 +1252,8 @@ Rule      Chile   2009    only    -       Mar     Sun>=9  3:00u   0       -
 Rule   Chile   2010    only    -       Apr     Sun>=1  3:00u   0       -
 Rule   Chile   2011    only    -       May     Sun>=2  3:00u   0       -
 Rule   Chile   2011    only    -       Aug     Sun>=16 4:00u   1:00    S
-Rule   Chile   2012    max     -       Apr     Sun>=23 3:00u   0       -
-Rule   Chile   2012    max     -       Sep     Sun>=2  4:00u   1:00    S
+Rule   Chile   2012    2015    -       Apr     Sun>=23 3:00u   0       -
+Rule   Chile   2012    2014    -       Sep     Sun>=2  4:00u   1:00    S
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
@@ -1259,11 +1264,13 @@ Zone America/Santiago   -4:42:46 -      LMT     1890
                        -4:00   -       CLT     1919 Jul  1 # Chile Time
                        -4:42:46 -      SMT     1927 Sep  1 # Santiago Mean Time
                        -5:00   Chile   CL%sT   1947 May 22 # Chile Time
-                       -4:00   Chile   CL%sT
+                       -4:00   Chile   CL%sT   2015 Apr 26  3:00u
+                       -3:00   -       CLT
 Zone Pacific/Easter    -7:17:44 -      LMT     1890
                        -7:17:28 -      EMT     1932 Sep    # Easter Mean Time
-                       -7:00   Chile   EAS%sT  1982 Mar 13 21:00 # Easter Time
-                       -6:00   Chile   EAS%sT
+                       -7:00   Chile   EAS%sT  1982 Mar 13 3:00u # Easter Time
+                       -6:00   Chile   EAS%sT  2015 Apr 26 3:00u
+                       -5:00   -       EAST
 #
 # Salas y Gómez Island is uninhabited.
 # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,

diff --git a/src/timezone/data/zone.tab b/src/timezone/data/zone.tab
index a7373f177df5607a9c66103e8142810764a57c5e..f418e7ffca1a9cadfbc292f08d7634a28456e736 100644 (file)
--- a/src/timezone/data/zone.tab
+++ b/src/timezone/data/zone.tab
@@ -274,7 +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  Central Time - 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/src/timezone/data/zone1970.tab b/src/timezone/data/zone1970.tab
index e971bc7f5a2197c60a23d5ff58a77b99ba7603e9..5da0200b434d9d969296ce86540f6746d584282b 100644 (file)
--- a/src/timezone/data/zone1970.tab
+++ b/src/timezone/data/zone1970.tab
@@ -233,7 +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  Central Time - 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

diff --git a/src/timezone/known_abbrevs.txt b/src/timezone/known_abbrevs.txt
index 990cf339d043afc79f275cb675af3af414878abf..d416c0d7a99803659ea5fd5bf8a5e1790e9f08ff 100644 (file)
--- a/src/timezone/known_abbrevs.txt
+++ b/src/timezone/known_abbrevs.txt
@@ -42,7 +42,7 @@ CHOT  28800
 CHUT   36000
 CKT    -36000
 CLST   -10800  D
-CLT    -14400
+CLT    -10800
 COT    -18000
 CST    -18000
 CST    -21600
@@ -53,7 +53,7 @@ ChST  36000
 DAVT   25200
 DDUT   36000
 EASST  -18000  D
-EAST   -21600
+EAST   -18000
 EAT    10800
 ECT    -18000
 EDT    -14400  D

diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt
index 1bb636741b46fd9a52affe6570ae32e65fe0c8b1..931fc7c5d8db6220769c43d72a1774dc4a7ff08b 100644 (file)
--- a/src/timezone/tznames/America.txt
+++ b/src/timezone/tznames/America.txt
@@ -116,7 +116,6 @@ CDT    -14400 D  # Cuba Central Daylight Time
 #  - CDT: Cuba Central Daylight Time (America)
 #  - CDT: Canada Central Daylight Time (America)
 CDT    -18000 D  # Central Daylight Time
-                 #     (America/Cancun)
                  #     (America/Chicago)
                  #     (America/Menominee)
                  #     (America/Merida)
@@ -126,10 +125,10 @@ CDT    -18000 D  # Central Daylight Time
                  #     (America/Rainy_River)
                  #     (America/Rankin_Inlet)
                  #     (America/Winnipeg)
-CLST   -10800 D  # Chile Summer Time
+CLST   -10800 D  # Chile Summer Time (obsolete)
                  #     (America/Santiago)
                  #     (Antarctica/Palmer)
-CLT    -14400    # Chile Time
+CLT    America/Santiago  # Chile Time
                  #     (America/Santiago)
                  #     (Antarctica/Palmer)
 COT    -18000    # Columbia Time (not in zic)
@@ -146,7 +145,6 @@ CST    -18000    # Cuba Central Standard Time (America)
 #  - CST: China Standard Time (Asia)
 #  - CST: Cuba Central Standard Time (America)
 CST    -21600    # Central Standard Time (America)
-                 #     (America/Cancun)
                  #     (America/Chicago)
                  #     (America/Menominee)
                  #     (America/Merida)
@@ -186,6 +184,7 @@ EGT     -3600    # East Greenland Time (Svalbard & Jan Mayen)
 # Other timezones:
 #  - EST: Eastern Standard Time (Australia)
 EST    -18000    # Eastern Standard Time (America)
+                 #     (America/Cancun)
                  #     (America/Cayman)
                  #     (America/Coral_Harbour)
                  #     (America/Detroit)

diff --git a/src/timezone/tznames/Antarctica.txt b/src/timezone/tznames/Antarctica.txt
index 2359020ef8798f4bfbc1e36c1b72d4a9f8335a19..17e52469223b6b35ad9a4419a5e95de6155c317f 100644 (file)
--- a/src/timezone/tznames/Antarctica.txt
+++ b/src/timezone/tznames/Antarctica.txt
@@ -10,10 +10,10 @@
 AWST    28800    # Australian Western Standard Time
                  #     (Antarctica/Casey)
                  #     (Australia/Perth)
-CLST   -10800 D  # Chile Summer Time
+CLST   -10800 D  # Chile Summer Time (obsolete)
                  #     (America/Santiago)
                  #     (Antarctica/Palmer)
-CLT    -14400    # Chile Time
+CLT    America/Santiago  # Chile Time
                  #     (America/Santiago)
                  #     (Antarctica/Palmer)
 DAVT    Antarctica/Davis  # Davis Time (Antarctica)

diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index 7a58e5900e5814a107c3d842d16706d11184553a..bb3b59196008e8bfd8706614e73b7dcbd5f78939 100644 (file)
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -86,7 +86,6 @@ COT    -18000    # Columbia Time (not in zic)
 #  - CDT: Cuba Central Daylight Time (America)
 #  - CDT: Canada Central Daylight Time (America)
 CDT    -18000 D  # Central Daylight Time
-                 #     (America/Cancun)
                  #     (America/Chicago)
                  #     (America/Menominee)
                  #     (America/Merida)
@@ -96,10 +95,10 @@ CDT    -18000 D  # Central Daylight Time
                  #     (America/Rainy_River)
                  #     (America/Rankin_Inlet)
                  #     (America/Winnipeg)
-CLST   -10800 D  # Chile Summer Time
+CLST   -10800 D  # Chile Summer Time (obsolete)
                  #     (America/Santiago)
                  #     (Antarctica/Palmer)
-CLT    -14400    # Chile Time
+CLT    America/Santiago  # Chile Time
                  #     (America/Santiago)
                  #     (Antarctica/Palmer)
 # CONFLICT! CST is not unique
@@ -108,7 +107,6 @@ CLT    -14400    # Chile Time
 #  - CST: China Standard Time (Asia)
 #  - CST: Cuba Central Standard Time (America)
 CST    -21600    # Central Standard Time (America)
-                 #     (America/Cancun)
                  #     (America/Chicago)
                  #     (America/Menominee)
                  #     (America/Merida)
@@ -145,6 +143,7 @@ EGT     -3600    # East Greenland Time (Svalbard & Jan Mayen)
 # Other timezones:
 #  - EST: Eastern Standard Time (Australia)
 EST    -18000    # Eastern Standard Time (America)
+                 #     (America/Cancun)
                  #     (America/Cayman)
                  #     (America/Coral_Harbour)
                  #     (America/Detroit)