diff -Nru tzdata-2023c/debian/changelog tzdata-2023c/debian/changelog
--- tzdata-2023c/debian/changelog	2023-04-13 15:17:25.000000000 +0200
+++ tzdata-2023c/debian/changelog	2023-05-20 01:32:19.000000000 +0200
@@ -1,3 +1,14 @@
+tzdata (2023c-0ubuntu0.20.04.2) focal; urgency=medium
+
+  * Build tzdata with PACKRATLIST=zone.tab. In combination with
+    PACKRATDATA=backzone (which is used since 2023c-0ubuntu0.20.04.1), time
+    zones that differ pre-1970 and had been resurrected will not incur changes
+    to data from 1970 on. This also removes Asia/Hanoi again. (LP: #2017999)
+  * Add an autopkgtest test case for post-1970 symlink consistency
+  * Update debconf template and translations
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sat, 20 May 2023 01:32:19 +0200
+
 tzdata (2023c-0ubuntu0.20.04.1) focal; urgency=medium
 
   * Build timezones that differ pre-1970 (LP: #2003797)
diff -Nru tzdata-2023c/debian/po/be.po tzdata-2023c/debian/po/be.po
--- tzdata-2023c/debian/po/be.po	2023-04-13 15:06:14.000000000 +0200
+++ tzdata-2023c/debian/po/be.po	2023-05-20 01:31:59.000000000 +0200
@@ -2121,13 +2121,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Харбін"
 
diff -Nru tzdata-2023c/debian/po/bg.po tzdata-2023c/debian/po/bg.po
--- tzdata-2023c/debian/po/bg.po	2023-04-13 15:06:22.000000000 +0200
+++ tzdata-2023c/debian/po/bg.po	2023-05-20 01:31:59.000000000 +0200
@@ -2114,13 +2114,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Харбин"
 
diff -Nru tzdata-2023c/debian/po/ca.po tzdata-2023c/debian/po/ca.po
--- tzdata-2023c/debian/po/ca.po	2023-04-13 15:06:27.000000000 +0200
+++ tzdata-2023c/debian/po/ca.po	2023-05-20 01:31:59.000000000 +0200
@@ -2201,13 +2201,6 @@
 msgid "Gaza"
 msgstr "Gaza"
 
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
 # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po]
 #. Type: select
 #. Choices
diff -Nru tzdata-2023c/debian/po/cs.po tzdata-2023c/debian/po/cs.po
--- tzdata-2023c/debian/po/cs.po	2023-04-13 15:06:46.000000000 +0200
+++ tzdata-2023c/debian/po/cs.po	2023-05-20 01:31:59.000000000 +0200
@@ -2097,13 +2097,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/da.po tzdata-2023c/debian/po/da.po
--- tzdata-2023c/debian/po/da.po	2023-04-13 15:06:55.000000000 +0200
+++ tzdata-2023c/debian/po/da.po	2023-05-20 01:31:59.000000000 +0200
@@ -2093,13 +2093,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/de.po tzdata-2023c/debian/po/de.po
--- tzdata-2023c/debian/po/de.po	2023-04-13 15:07:03.000000000 +0200
+++ tzdata-2023c/debian/po/de.po	2023-05-20 01:31:59.000000000 +0200
@@ -2096,13 +2096,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/en.po tzdata-2023c/debian/po/en.po
--- tzdata-2023c/debian/po/en.po	2023-04-13 15:07:28.000000000 +0200
+++ tzdata-2023c/debian/po/en.po	2023-05-20 01:31:59.000000000 +0200
@@ -2093,13 +2093,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/es.po tzdata-2023c/debian/po/es.po
--- tzdata-2023c/debian/po/es.po	2023-04-13 15:07:35.000000000 +0200
+++ tzdata-2023c/debian/po/es.po	2023-05-20 01:31:59.000000000 +0200
@@ -2127,13 +2127,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/eu.po tzdata-2023c/debian/po/eu.po
--- tzdata-2023c/debian/po/eu.po	2023-04-13 15:07:42.000000000 +0200
+++ tzdata-2023c/debian/po/eu.po	2023-05-20 01:31:59.000000000 +0200
@@ -2103,13 +2103,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/fi.po tzdata-2023c/debian/po/fi.po
--- tzdata-2023c/debian/po/fi.po	2023-04-13 15:07:49.000000000 +0200
+++ tzdata-2023c/debian/po/fi.po	2023-05-20 01:31:59.000000000 +0200
@@ -2102,13 +2102,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/fr.po tzdata-2023c/debian/po/fr.po
--- tzdata-2023c/debian/po/fr.po	2023-04-13 15:07:54.000000000 +0200
+++ tzdata-2023c/debian/po/fr.po	2023-05-20 01:31:59.000000000 +0200
@@ -2104,13 +2104,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/gl.po tzdata-2023c/debian/po/gl.po
--- tzdata-2023c/debian/po/gl.po	2023-04-13 15:07:59.000000000 +0200
+++ tzdata-2023c/debian/po/gl.po	2023-05-20 01:31:59.000000000 +0200
@@ -2098,13 +2098,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/gu.po tzdata-2023c/debian/po/gu.po
--- tzdata-2023c/debian/po/gu.po	2023-04-13 15:08:05.000000000 +0200
+++ tzdata-2023c/debian/po/gu.po	2023-05-20 01:31:59.000000000 +0200
@@ -2101,13 +2101,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "હાર્બિન"
 
diff -Nru tzdata-2023c/debian/po/he.po tzdata-2023c/debian/po/he.po
--- tzdata-2023c/debian/po/he.po	2023-04-13 15:08:10.000000000 +0200
+++ tzdata-2023c/debian/po/he.po	2023-05-20 01:31:59.000000000 +0200
@@ -2103,13 +2103,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "חרבין"
 
diff -Nru tzdata-2023c/debian/po/hr.po tzdata-2023c/debian/po/hr.po
--- tzdata-2023c/debian/po/hr.po	2023-04-13 15:08:15.000000000 +0200
+++ tzdata-2023c/debian/po/hr.po	2023-05-20 01:31:59.000000000 +0200
@@ -2121,13 +2121,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/hu.po tzdata-2023c/debian/po/hu.po
--- tzdata-2023c/debian/po/hu.po	2023-04-13 15:08:21.000000000 +0200
+++ tzdata-2023c/debian/po/hu.po	2023-05-20 01:31:59.000000000 +0200
@@ -2101,13 +2101,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/id.po tzdata-2023c/debian/po/id.po
--- tzdata-2023c/debian/po/id.po	2023-04-13 15:08:26.000000000 +0200
+++ tzdata-2023c/debian/po/id.po	2023-05-20 01:31:59.000000000 +0200
@@ -2119,13 +2119,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/it.po tzdata-2023c/debian/po/it.po
--- tzdata-2023c/debian/po/it.po	2023-04-13 15:08:33.000000000 +0200
+++ tzdata-2023c/debian/po/it.po	2023-05-20 01:31:59.000000000 +0200
@@ -2094,13 +2094,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/ja.po tzdata-2023c/debian/po/ja.po
--- tzdata-2023c/debian/po/ja.po	2023-04-13 15:08:38.000000000 +0200
+++ tzdata-2023c/debian/po/ja.po	2023-05-20 01:31:59.000000000 +0200
@@ -2093,13 +2093,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "ハルビン"
 
diff -Nru tzdata-2023c/debian/po/ku.po tzdata-2023c/debian/po/ku.po
--- tzdata-2023c/debian/po/ku.po	2023-04-13 15:08:43.000000000 +0200
+++ tzdata-2023c/debian/po/ku.po	2023-05-20 01:31:59.000000000 +0200
@@ -2116,13 +2116,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/lt.po tzdata-2023c/debian/po/lt.po
--- tzdata-2023c/debian/po/lt.po	2023-04-13 15:08:49.000000000 +0200
+++ tzdata-2023c/debian/po/lt.po	2023-05-20 01:31:59.000000000 +0200
@@ -2111,13 +2111,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbinas"
 
diff -Nru tzdata-2023c/debian/po/ml.po tzdata-2023c/debian/po/ml.po
--- tzdata-2023c/debian/po/ml.po	2023-04-13 15:08:53.000000000 +0200
+++ tzdata-2023c/debian/po/ml.po	2023-05-20 01:31:59.000000000 +0200
@@ -2118,13 +2118,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "ഹാര്‍ബിന്‍"
 
diff -Nru tzdata-2023c/debian/po/nl.po tzdata-2023c/debian/po/nl.po
--- tzdata-2023c/debian/po/nl.po	2023-04-13 15:08:59.000000000 +0200
+++ tzdata-2023c/debian/po/nl.po	2023-05-20 01:31:59.000000000 +0200
@@ -2097,13 +2097,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/pl.po tzdata-2023c/debian/po/pl.po
--- tzdata-2023c/debian/po/pl.po	2023-04-13 15:09:04.000000000 +0200
+++ tzdata-2023c/debian/po/pl.po	2023-05-20 01:31:59.000000000 +0200
@@ -2097,13 +2097,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/pt_BR.po tzdata-2023c/debian/po/pt_BR.po
--- tzdata-2023c/debian/po/pt_BR.po	2023-04-13 15:09:09.000000000 +0200
+++ tzdata-2023c/debian/po/pt_BR.po	2023-05-20 01:31:59.000000000 +0200
@@ -2098,13 +2098,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/pt.po tzdata-2023c/debian/po/pt.po
--- tzdata-2023c/debian/po/pt.po	2023-04-13 15:09:15.000000000 +0200
+++ tzdata-2023c/debian/po/pt.po	2023-05-20 01:31:59.000000000 +0200
@@ -2097,13 +2097,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/ru.po tzdata-2023c/debian/po/ru.po
--- tzdata-2023c/debian/po/ru.po	2023-04-13 15:09:21.000000000 +0200
+++ tzdata-2023c/debian/po/ru.po	2023-05-20 01:31:59.000000000 +0200
@@ -2101,13 +2101,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Харбин"
 
diff -Nru tzdata-2023c/debian/po/sk.po tzdata-2023c/debian/po/sk.po
--- tzdata-2023c/debian/po/sk.po	2023-04-13 15:09:26.000000000 +0200
+++ tzdata-2023c/debian/po/sk.po	2023-05-20 01:31:59.000000000 +0200
@@ -2097,13 +2097,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Charbin"
 
diff -Nru tzdata-2023c/debian/po/sq.po tzdata-2023c/debian/po/sq.po
--- tzdata-2023c/debian/po/sq.po	2023-04-13 15:09:31.000000000 +0200
+++ tzdata-2023c/debian/po/sq.po	2023-05-20 01:31:59.000000000 +0200
@@ -2117,13 +2117,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/sv.po tzdata-2023c/debian/po/sv.po
--- tzdata-2023c/debian/po/sv.po	2023-04-13 15:09:37.000000000 +0200
+++ tzdata-2023c/debian/po/sv.po	2023-05-20 01:31:59.000000000 +0200
@@ -2098,13 +2098,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/templates.pot tzdata-2023c/debian/po/templates.pot
--- tzdata-2023c/debian/po/templates.pot	2023-04-13 15:09:41.000000000 +0200
+++ tzdata-2023c/debian/po/templates.pot	2023-05-20 01:31:59.000000000 +0200
@@ -2091,13 +2091,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr ""
 
diff -Nru tzdata-2023c/debian/po/th.po tzdata-2023c/debian/po/th.po
--- tzdata-2023c/debian/po/th.po	2023-04-13 15:09:46.000000000 +0200
+++ tzdata-2023c/debian/po/th.po	2023-05-20 01:31:59.000000000 +0200
@@ -2093,13 +2093,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "ฮาร์บิน"
 
diff -Nru tzdata-2023c/debian/po/tr.po tzdata-2023c/debian/po/tr.po
--- tzdata-2023c/debian/po/tr.po	2023-04-13 15:09:52.000000000 +0200
+++ tzdata-2023c/debian/po/tr.po	2023-05-20 01:31:59.000000000 +0200
@@ -2095,13 +2095,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/vi.po tzdata-2023c/debian/po/vi.po
--- tzdata-2023c/debian/po/vi.po	2023-04-13 15:09:56.000000000 +0200
+++ tzdata-2023c/debian/po/vi.po	2023-05-20 01:31:59.000000000 +0200
@@ -2117,13 +2117,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/po/wo.po tzdata-2023c/debian/po/wo.po
--- tzdata-2023c/debian/po/wo.po	2023-04-13 15:10:02.000000000 +0200
+++ tzdata-2023c/debian/po/wo.po	2023-05-20 01:31:59.000000000 +0200
@@ -2110,13 +2110,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
diff -Nru tzdata-2023c/debian/rules tzdata-2023c/debian/rules
--- tzdata-2023c/debian/rules	2023-04-13 15:05:37.000000000 +0200
+++ tzdata-2023c/debian/rules	2023-05-20 01:31:13.000000000 +0200
@@ -28,10 +28,10 @@
 
 override_dh_auto_build-indep:
 	# Generate a tzdata.zi file
-	$(MAKE) AWK=gawk BACKWARD="backward" PACKRATDATA=backzone VERSION_DEPS= tzdata.zi
+	$(MAKE) AWK=gawk BACKWARD="backward" PACKRATDATA=backzone PACKRATLIST=zone.tab VERSION_DEPS= tzdata.zi
 
 	# Generate the leapseconds file
-	$(MAKE) AWK=gawk PACKRATDATA=backzone leapseconds
+	$(MAKE) AWK=gawk PACKRATDATA=backzone PACKRATLIST=zone.tab leapseconds
 
 	# Build the timezone data
 	/usr/sbin/zic -d $(TZGEN) -L /dev/null tzdata.zi ; \
diff -Nru tzdata-2023c/debian/tests/python tzdata-2023c/debian/tests/python
--- tzdata-2023c/debian/tests/python	2023-04-13 15:16:52.000000000 +0200
+++ tzdata-2023c/debian/tests/python	2023-05-20 01:30:46.000000000 +0200
@@ -7,6 +7,8 @@
 import datetime
 import functools
 import os
+import pathlib
+import re
 import sys
 import typing
 import unittest
@@ -44,6 +46,19 @@
 
     return available
 
+ROOT_DIR = pathlib.Path(__file__).parent.parent.parent
+
+
+def read_backwards_links(backwards_file: pathlib.Path):
+    """Read backwards compatibility links from the upstream backwards file."""
+    backwards_links = {}
+    for line in backwards_file.read_text(encoding="utf-8").splitlines():
+        match = re.match(r"^Link\t(?P<target>\S+)\t+(?P<link_name>\S+)", line)
+        if not match:
+            continue
+        backwards_links[match.group("link_name")] = match.group("target")
+    return backwards_links
+
 
 class TestZoneinfo(unittest.TestCase):
     """Test timezones using pytz module."""
@@ -57,22 +72,23 @@
     def test_available_timezones_count(self) -> None:
         """Test available_timezones() count to be reasonable."""
         zones = len(available_timezones())
-        self.assertGreaterEqual(zones, 597, "less zones than 2022g-0ubuntu0.22.10.1")
-        self.assertLess(
-            zones, round(597 * 1.1), ">10% more zones than 2022g-0ubuntu0.22.10.1"
-        )
+        self.assertGreaterEqual(zones, 597, "less zones than 2022g-2")
+        self.assertLess(zones, round(597 * 1.1), ">10% more zones than 2022g-2")
 
-    def _test_equal_zones(self, timezone1, timezone2) -> None:
-        """Test timezones to be heuristically equal regardless of the name."""
-        date1 = timezone1.localize(datetime.datetime(2020, 10, 31, 12))
-        date2 = timezone2.localize(datetime.datetime(2020, 10, 31, 12))
-        self.assertEqual(date1.tzname(), date2.tzname())
+    def _assert_equal_zones_at_date(
+        self, date: datetime.datetime, timezone1, timezone2
+    ) -> None:
+        date1 = timezone1.localize(date)
+        date2 = timezone2.localize(date)
         self.assertEqual(date1 - date2, datetime.timedelta(seconds=0))
-
-        date1 = timezone1.localize(datetime.datetime(2021, 7, 3, 12))
-        date2 = timezone2.localize(datetime.datetime(2021, 7, 3, 12))
         self.assertEqual(date1.tzname(), date2.tzname())
-        self.assertEqual(date1 - date2, datetime.timedelta(seconds=0))
+
+    def _assert_equal_zones(self, timezone1, timezone2) -> None:
+        """Test timezones to be heuristically equal regardless of the name."""
+        october_2020 = datetime.datetime(2020, 10, 31, 12)
+        self._assert_equal_zones_at_date(october_2020, timezone1, timezone2)
+        july_2021 = datetime.datetime(2021, 7, 3, 12)
+        self._assert_equal_zones_at_date(july_2021, timezone1, timezone2)
 
     def test_systemv_timezones(self) -> None:
         """Test that the old SystemV timezones are still available."""
@@ -104,6 +120,25 @@
         oslo = pytz.timezone("Europe/Oslo")
         self.assertEqual(self._hours(oslo.localize(date).utcoffset()), 2)
 
+    def test_post_1970_symlinks_consistency(self) -> None:
+        """Test that post-1970 symlinks are consistent with pre-1970 timezones.
+
+        Building tzdata with PACKRATDATA=backzone will result in separate
+        time zones for time zones that differ only before 1970. These time
+        zones should behave identical after 1970. Building tzdata without
+        PACKRATDATA=backzone will result in one of the time zones become a
+        symlink to the other time zone.
+        """
+        links = read_backwards_links(ROOT_DIR / "backward")
+        for link_name, target in links.items():
+            with self.subTest(f"{link_name} -> {target}"):
+                tz_link = pytz.timezone(link_name)
+                tz_target = pytz.timezone(target)
+                now = datetime.datetime.now()
+                self._assert_equal_zones_at_date(now, tz_link, tz_target)
+                future = now + datetime.timedelta(days=30 * 6)
+                self._assert_equal_zones_at_date(future, tz_link, tz_target)
+
     @unittest.skip("Needs https://launchpad.net/bugs/207604")
     def test_timezones(self) -> None:
         """Test all zones to load, have a name, and have a reasonable offset."""
diff -Nru tzdata-2023c/debian/tzdata.templates tzdata-2023c/debian/tzdata.templates
--- tzdata-2023c/debian/tzdata.templates	2023-04-13 15:16:13.000000000 +0200
+++ tzdata-2023c/debian/tzdata.templates	2023-05-20 01:32:19.000000000 +0200
@@ -55,7 +55,7 @@
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 #flag:partial
-__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Atyrau, Baghdad, Bahrain, Baku, Bangkok, Barnaul, Beirut, Bishkek, Brunei, Chita, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Famagusta, Gaza, Hanoi, Harbin, Hebron, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Khandyga, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novokuznetsk, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qostanay, Qyzylorda, Rangoon, Riyadh, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Srednekolymsk, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Tomsk, Ujung_Pandang, Ulaanbaatar, Urumqi, Ust-Nera, Vientiane, Vladivostok, Yakutsk, Yangon, Yekaterinburg, Yerevan
+__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Atyrau, Baghdad, Bahrain, Baku, Bangkok, Barnaul, Beirut, Bishkek, Brunei, Chita, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Famagusta, Gaza, Harbin, Hebron, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Khandyga, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novokuznetsk, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qostanay, Qyzylorda, Rangoon, Riyadh, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Srednekolymsk, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Tomsk, Ujung_Pandang, Ulaanbaatar, Urumqi, Ust-Nera, Vientiane, Vladivostok, Yakutsk, Yangon, Yekaterinburg, Yerevan
 _Description: Time zone:
  Please select the city or region corresponding to your time zone.