[tz] Undoing the effect of the new alike-since-1970 patch

[Paul Eggert]

On 9/20/21 5:34 AM, Almaz Mingaleev wrote:
> Thanks for the patch, Paul.
> I've applied it, but it is not what zone.tab was in 2021a 

Thanks for checking. Unfortunately I overlooked one of the important 
commits since 2021a. I fixed that and came up with the attached patch; 
please try that instead.

> Is it safe to revert zone.tab to what it was in 2021a
> <https://github.com/eggert/tz/blob/3831c591e188edc16d1a6855fb20ebee78c4e27b/zone.tab>

Almost, but that misses the post-2021a replacement of Enderbury with 
Kanton.  Here are the changes from 2021a to the zone.tab that results 
from applying the attached patch to the current main branch of the 
development repository:

diff --git a/zone.tab b/zone.tab
index 1f0128f..3d4a7f7 100644
--- a/zone.tab
+++ b/zone.tab
@@ -3,7 +3,7 @@
  # This file is in the public domain, so clarified as of
  # 2009-05-17 by Arthur David Olson.
  #
-# From Paul Eggert (2018-06-27):
+# From Paul Eggert (2021-09-20):
  # This file is intended as a backward-compatibility aid for older 
programs.
  # New programs should use zone1970.tab.  This file is like 
zone1970.tab (see
  # zone1970.tab's comments), but with the following additional 
restrictions:
@@ -16,6 +16,9 @@
  # clocks have agreed since 1970; this is a narrower definition than
  # that of zone1970.tab.
  #
+# Unlike zone1970.tab, a row's third column can be a Link from
+# 'backward' instead of a Zone,
+#
  # This table is intended as an aid for users, to help them select 
timezones
  # appropriate for their practical needs.  It is not intended to take or
  # endorse any position on legal or territorial claims.
@@ -228,7 +231,7 @@ KE	-0117+03649	Africa/Nairobi
  KG	+4254+07436	Asia/Bishkek
  KH	+1133+10455	Asia/Phnom_Penh
  KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
-KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
+KI	-0247-17143	Pacific/Kanton	Phoenix Islands
  KI	+0152-15720	Pacific/Kiritimati	Line Islands
  KM	-1141+04316	Indian/Comoro
  KN	+1718-06243	America/St_Kitts
@@ -391,7 +394,7 @@ TK	-0922-17114	Pacific/Fakaofo
  TL	-0833+12535	Asia/Dili
  TM	+3757+05823	Asia/Ashgabat
  TN	+3648+01011	Africa/Tunis
-TO	-2110-17510	Pacific/Tongatapu
+TO	-210800-1751200	Pacific/Tongatapu
  TR	+4101+02858	Europe/Istanbul
  TT	+1039-06131	America/Port_of_Spain
  TV	-0831+17913	Pacific/Funafuti
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Revert-May-patch-to-zone.tab.patch
Type: text/x-patch
Size: 20265 bytes
Desc: not available
URL: <https://mm.icann.org/pipermail/tz/attachments/20210920/cc179f6f/0001-Revert-May-patch-to-zone.tab-0001.patch>