diff -Nru tzdata-2023c/debian/changelog tzdata-2023c/debian/changelog --- tzdata-2023c/debian/changelog 2023-04-03 12:59:10.000000000 +0200 +++ tzdata-2023c/debian/changelog 2023-05-19 12:05:31.000000000 +0200 @@ -1,3 +1,14 @@ +tzdata (2023c-2exp1ubuntu1.1) lunar; urgency=medium + + * Build tzdata with PACKRATLIST=zone.tab. In combination with + PACKRATDATA=backzone (which is used since 2022g-3), time zones that differ + pre-1970 and had been resurrected will not incur changes to data from 1970 + on. (LP: #2017999) This also removes Asia/Hanoi again. + * Add an autopkgtest test case for post-1970 symlink consistency + * Update debconf template and translations + + -- Benjamin Drung Fri, 19 May 2023 12:05:31 +0200 + tzdata (2023c-2exp1ubuntu1) lunar; urgency=medium * Merge with Debian experimental. Remaining changes: diff -Nru tzdata-2023c/debian/generate_debconf_templates tzdata-2023c/debian/generate_debconf_templates --- tzdata-2023c/debian/generate_debconf_templates 2023-04-03 12:48:53.000000000 +0200 +++ tzdata-2023c/debian/generate_debconf_templates 2023-05-19 12:03:13.000000000 +0200 @@ -67,28 +67,51 @@ # List of symlinks that should be selectable INCLUDE_SYMLINKS = { + "Africa/Timbuktu", + "America/Argentina/ComodRivadavia", "America/Atka", + "America/Coral_Harbour", + "America/Ensenada", "America/Godthab", "America/Kralendijk", "America/Lower_Princes", "America/Marigot", + "America/Montreal", + "America/Nipigon", + "America/Pangnirtung", "America/Porto_Acre", + "America/Rainy_River", + "America/Rosario", "America/Santa_Isabel", "America/Shiprock", "America/St_Barthelemy", + "America/Thunder_Bay", "America/Virgin", + "America/Yellowknife", "Arctic/Longyearbyen", + "Asia/Chongqing", + "Asia/Harbin", "Asia/Istanbul", + "Asia/Kashgar", + "Asia/Tel_Aviv", "Asia/Ujung_Pandang", + "Atlantic/Jan_Mayen", "Australia/Canberra", + "Australia/Currie", "Australia/Yancowinna", + "Europe/Belfast", "Europe/Bratislava", "Europe/Busingen", "Europe/Mariehamn", "Europe/Nicosia", "Europe/Podgorica", "Europe/San_Marino", + "Europe/Tiraspol", + "Europe/Uzhgorod", "Europe/Vatican", + "Europe/Zaporozhye", + "Pacific/Enderbury", + "Pacific/Johnston", "Pacific/Ponape", "Pacific/Samoa", "Pacific/Truk", diff -Nru tzdata-2023c/debian/po/be.po tzdata-2023c/debian/po/be.po --- tzdata-2023c/debian/po/be.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/be.po 2023-05-19 12:04:21.000000000 +0200 @@ -1992,13 +1992,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/bg.po 2023-05-19 12:04:21.000000000 +0200 @@ -1985,13 +1985,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ca.po 2023-05-19 12:04:21.000000000 +0200 @@ -2071,13 +2071,6 @@ msgid "Gaza" msgstr "Gaza" -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/cs.po 2023-05-19 12:04:21.000000000 +0200 @@ -1975,13 +1975,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/da.po 2023-05-19 12:04:21.000000000 +0200 @@ -1970,13 +1970,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/de.po 2023-05-19 12:04:41.000000000 +0200 @@ -1973,13 +1973,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "Hanoi" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/en.po 2023-05-19 12:04:41.000000000 +0200 @@ -1970,13 +1970,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "Hanoi" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/es.po 2023-05-19 12:04:21.000000000 +0200 @@ -2005,13 +2005,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/eu.po 2023-05-19 12:04:21.000000000 +0200 @@ -1980,13 +1980,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/fi.po 2023-05-19 12:04:21.000000000 +0200 @@ -1973,13 +1973,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/fr.po 2023-05-19 12:04:21.000000000 +0200 @@ -1981,13 +1981,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/gl.po 2023-05-19 12:04:21.000000000 +0200 @@ -1974,13 +1974,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/gu.po 2023-05-19 12:04:21.000000000 +0200 @@ -1978,13 +1978,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/he.po 2023-05-19 12:04:21.000000000 +0200 @@ -1980,13 +1980,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/hr.po 2023-05-19 12:04:21.000000000 +0200 @@ -1986,13 +1986,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/hu.po 2023-05-19 12:04:21.000000000 +0200 @@ -1978,13 +1978,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/id.po 2023-05-19 12:04:21.000000000 +0200 @@ -1996,13 +1996,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/it.po 2023-05-19 12:04:21.000000000 +0200 @@ -1971,13 +1971,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ja.po 2023-05-19 12:04:21.000000000 +0200 @@ -1970,13 +1970,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "ハルビン" diff -Nru tzdata-2023c/debian/po/ko.po tzdata-2023c/debian/po/ko.po --- tzdata-2023c/debian/po/ko.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ko.po 2023-05-19 12:04:21.000000000 +0200 @@ -1969,13 +1969,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ku.po 2023-05-19 12:04:21.000000000 +0200 @@ -1987,13 +1987,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/lt.po 2023-05-19 12:04:21.000000000 +0200 @@ -1982,13 +1982,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ml.po 2023-05-19 12:04:21.000000000 +0200 @@ -1988,13 +1988,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/nl.po 2023-05-19 12:04:41.000000000 +0200 @@ -1974,13 +1974,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "Hanoi" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/pl.po 2023-05-19 12:04:21.000000000 +0200 @@ -1975,13 +1975,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/pt_BR.po 2023-05-19 12:04:21.000000000 +0200 @@ -1976,13 +1976,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/pt.po 2023-05-19 12:04:21.000000000 +0200 @@ -1975,13 +1975,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ru.po 2023-05-19 12:04:21.000000000 +0200 @@ -1978,13 +1978,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/sk.po 2023-05-19 12:04:21.000000000 +0200 @@ -1974,13 +1974,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/sq.po 2023-05-19 12:04:21.000000000 +0200 @@ -1987,13 +1987,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/sv.po 2023-05-19 12:04:21.000000000 +0200 @@ -1973,13 +1973,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/templates.pot 2023-05-19 12:04:18.000000000 +0200 @@ -1968,13 +1968,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/th.po 2023-05-19 12:04:22.000000000 +0200 @@ -1970,13 +1970,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/tr.po 2023-05-19 12:04:41.000000000 +0200 @@ -1973,13 +1973,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "Hanoi" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/vi.po 2023-05-19 12:04:22.000000000 +0200 @@ -1987,13 +1987,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/wo.po 2023-05-19 12:04:22.000000000 +0200 @@ -1981,13 +1981,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" diff -Nru tzdata-2023c/debian/rules tzdata-2023c/debian/rules --- tzdata-2023c/debian/rules 2023-04-03 12:48:25.000000000 +0200 +++ tzdata-2023c/debian/rules 2023-05-19 12:03:13.000000000 +0200 @@ -13,10 +13,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-03 12:27:44.000000000 +0200 +++ tzdata-2023c/debian/tests/python 2023-05-19 12:03:13.000000000 +0200 @@ -7,11 +7,25 @@ import datetime import os import pathlib +import re import sys import typing import unittest import zoneinfo +ROOT_DIR = pathlib.Path(__file__).parent.parent.parent + + +def read_backwards_links(backwards_file: pathlib.Path) -> dict[str, str]: + """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\S+)\t+(?P\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 Python's zoneinfo module.""" @@ -25,8 +39,8 @@ def test_available_timezones_count(self) -> None: """Test available_timezones() count to be reasonable.""" zones = len(zoneinfo.available_timezones()) - self.assertGreaterEqual(zones, 598, "less zones than 2022g-3") - self.assertLess(zones, round(598 * 1.1), ">10% more zones than 2022g-3") + self.assertGreaterEqual(zones, 597, "less zones than 2022g-2") + self.assertLess(zones, round(597 * 1.1), ">10% more zones than 2022g-2") def test_daylight_saving_transition(self) -> None: """Test daylight saving time transition from Python documentation.""" @@ -36,19 +50,25 @@ next_day = date + datetime.timedelta(days=1) self.assertEqual(next_day.tzname(), "PST") - def _test_equal_zones( - self, tzinfo1: zoneinfo.ZoneInfo, tzinfo2: zoneinfo.ZoneInfo + def _assert_equal_zones_at_date( + self, + date: datetime.datetime, + timezone1: zoneinfo.ZoneInfo, + timezone2: zoneinfo.ZoneInfo, ) -> None: - """Test timezones to be heuristically equal regardless of the name.""" - date1 = datetime.datetime(2020, 10, 31, 12, tzinfo=tzinfo1) - date2 = date1.replace(tzinfo=tzinfo2) - self.assertEqual(date1.tzname(), date2.tzname()) + date1 = date.replace(tzinfo=timezone1) + date2 = date.replace(tzinfo=timezone2) self.assertEqual(date1 - date2, datetime.timedelta(seconds=0)) - - date1 = datetime.datetime(2021, 7, 3, 12, tzinfo=tzinfo1) - date2 = date1.replace(tzinfo=tzinfo2) self.assertEqual(date1.tzname(), date2.tzname()) - self.assertEqual(date1 - date2, datetime.timedelta(seconds=0)) + + def _assert_equal_zones( + self, timezone1: zoneinfo.ZoneInfo, timezone2: zoneinfo.ZoneInfo + ) -> 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) @unittest.skipIf(os.environ.get("PYTHONTZPATH"), "requires installed tzdata") def test_localtime(self) -> None: @@ -56,7 +76,7 @@ localtime = pathlib.Path("/etc/localtime") zone = str(localtime.resolve().relative_to("/usr/share/zoneinfo")) tzinfo = zoneinfo.ZoneInfo("localtime") - self._test_equal_zones(tzinfo, zoneinfo.ZoneInfo(zone)) + self._assert_equal_zones(tzinfo, zoneinfo.ZoneInfo(zone)) def _test_timezone(self, zone: str) -> None: """Test zone to load, have a name, and have a reasonable offset.""" @@ -82,6 +102,25 @@ oslo = zoneinfo.ZoneInfo("Europe/Oslo") self.assertEqual(self._hours(date.replace(tzinfo=oslo).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 = zoneinfo.ZoneInfo(link_name) + tz_target = zoneinfo.ZoneInfo(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) + def test_timezones(self) -> None: """Test all zones to load, have a name, and have a reasonable offset.""" for zone in zoneinfo.available_timezones(): diff -Nru tzdata-2023c/debian/tzdata.templates tzdata-2023c/debian/tzdata.templates --- tzdata-2023c/debian/tzdata.templates 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/tzdata.templates 2023-05-19 12:04:21.000000000 +0200 @@ -47,7 +47,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, 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, 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.