diff -Nru tzdata-2023c/debian/changelog tzdata-2023c/debian/changelog --- tzdata-2023c/debian/changelog 2023-04-13 14:59:54.000000000 +0200 +++ tzdata-2023c/debian/changelog 2023-04-26 13:51:32.000000000 +0200 @@ -1,3 +1,17 @@ +tzdata (2023c-0ubuntu0.22.04.2) jammy; urgency=medium + + * Do not update US/* timezones to their America/* counterparts. + Drop Asia/Rangoon from debconf options (was renamed to Asia/Yangon). + (Closes: #688318, LP: #772024) + * Fix inconsistencies introduced by building timezones that differ pre-1970 + (LP: #2003797): + - Do not replace Europe/Uzhgorod and Europe/Zaporozhye by Europe/Kyiv + - Add Pacific/Enderbury back to debconf options + * Test convert_timezone for consistency + * Update Mideast/Riyadh8[789] conversion target to Asia/Riyadh + + -- Benjamin Drung Wed, 26 Apr 2023 13:51:32 +0200 + tzdata (2023c-0ubuntu0.22.04.1) jammy; urgency=medium * Build timezones that differ pre-1970 (LP: #2003797) diff -Nru tzdata-2023c/debian/control tzdata-2023c/debian/control --- tzdata-2023c/debian/control 2023-04-13 14:58:05.000000000 +0200 +++ tzdata-2023c/debian/control 2023-04-26 13:51:32.000000000 +0200 @@ -2,7 +2,7 @@ Section: localization Priority: required Build-Depends: debhelper-compat (= 13) -Build-Depends-Indep: gawk, po-debconf, python3 (>= 3.9), symlinks, icu-devtools +Build-Depends-Indep: gawk, po-debconf, python3 (>= 3.9), python3-debian, symlinks, icu-devtools Rules-Requires-Root: no Maintainer: Ubuntu Developers XSBC-Original-Maintainer: GNU Libc Maintainers diff -Nru tzdata-2023c/debian/po/be.po tzdata-2023c/debian/po/be.po --- tzdata-2023c/debian/po/be.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/be.po 2023-04-26 13:51:32.000000000 +0200 @@ -2354,13 +2354,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Рангун" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Рыяд" @@ -3174,6 +3167,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Эндарбары" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Факаёфа" @@ -3492,9 +3492,6 @@ msgid "Mountain" msgstr "" -#~ msgid "Enderbury" -#~ msgstr "Эндарбары" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/bg.po tzdata-2023c/debian/po/bg.po --- tzdata-2023c/debian/po/bg.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/bg.po 2023-04-26 13:51:32.000000000 +0200 @@ -2347,13 +2347,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Рангун" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Рияд" @@ -3167,6 +3160,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Ендербъри" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Факаофо" @@ -3485,9 +3485,6 @@ msgid "Mountain" msgstr "" -#~ msgid "Enderbury" -#~ msgstr "Ендербъри" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/ca.po tzdata-2023c/debian/po/ca.po --- tzdata-2023c/debian/po/ca.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/ca.po 2023-04-26 13:51:32.000000000 +0200 @@ -2450,13 +2450,6 @@ msgid "Qyzylorda" msgstr "Qyzylorda" -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices @@ -3331,6 +3324,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3662,9 +3662,6 @@ msgid "Mountain" msgstr "Muntanya" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/cs.po tzdata-2023c/debian/po/cs.po --- tzdata-2023c/debian/po/cs.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/cs.po 2023-04-26 13:51:32.000000000 +0200 @@ -2331,13 +2331,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijád" @@ -3143,6 +3136,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury (Phoenixovy ostrovy)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3457,9 +3457,6 @@ msgid "Mountain" msgstr "Horské" -#~ msgid "Enderbury" -#~ msgstr "Enderbury (Phoenixovy ostrovy)" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/da.po tzdata-2023c/debian/po/da.po --- tzdata-2023c/debian/po/da.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/da.po 2023-04-26 13:51:32.000000000 +0200 @@ -2326,13 +2326,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" @@ -3141,6 +3134,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3455,9 +3455,6 @@ msgid "Mountain" msgstr "Mountain" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/de.po tzdata-2023c/debian/po/de.po --- tzdata-2023c/debian/po/de.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/de.po 2023-04-26 13:51:32.000000000 +0200 @@ -2329,13 +2329,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangun" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riad" @@ -3141,6 +3134,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3455,9 +3455,6 @@ msgid "Mountain" msgstr "Gebirge (Mountain)" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/en.po tzdata-2023c/debian/po/en.po --- tzdata-2023c/debian/po/en.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/en.po 2023-04-26 13:51:32.000000000 +0200 @@ -2326,13 +2326,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" @@ -3136,6 +3129,13 @@ #. Type: select #. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "" + +#. Type: select +#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/es.po tzdata-2023c/debian/po/es.po --- tzdata-2023c/debian/po/es.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/es.po 2023-04-26 13:51:32.000000000 +0200 @@ -2361,13 +2361,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riad" @@ -3173,6 +3166,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3487,9 +3487,6 @@ msgid "Mountain" msgstr "Montaña" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/eu.po tzdata-2023c/debian/po/eu.po --- tzdata-2023c/debian/po/eu.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/eu.po 2023-04-26 13:51:32.000000000 +0200 @@ -2336,13 +2336,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" @@ -3154,6 +3147,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3468,9 +3468,6 @@ msgid "Mountain" msgstr "Mendia" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/fi.po tzdata-2023c/debian/po/fi.po --- tzdata-2023c/debian/po/fi.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/fi.po 2023-04-26 13:51:32.000000000 +0200 @@ -2335,13 +2335,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Yangôn" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riad" @@ -3155,6 +3148,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3471,9 +3471,6 @@ msgid "Mountain" msgstr "Vuori" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV-tyylinen" diff -Nru tzdata-2023c/debian/po/fr.po tzdata-2023c/debian/po/fr.po --- tzdata-2023c/debian/po/fr.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/fr.po 2023-04-26 13:51:32.000000000 +0200 @@ -2337,13 +2337,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoun" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyad" @@ -3149,6 +3142,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury (îles Phoenix)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3463,9 +3463,6 @@ msgid "Mountain" msgstr "Rocheuses (Mountain)" -#~ msgid "Enderbury" -#~ msgstr "Enderbury (îles Phoenix)" - #~ msgid "SystemV" #~ msgstr "Système V" diff -Nru tzdata-2023c/debian/po/gl.po tzdata-2023c/debian/po/gl.po --- tzdata-2023c/debian/po/gl.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/gl.po 2023-04-26 13:51:32.000000000 +0200 @@ -2330,13 +2330,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "O Riad" @@ -3142,6 +3135,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury (Illas Phoenix)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3456,9 +3456,6 @@ msgid "Mountain" msgstr "Montañas" -#~ msgid "Enderbury" -#~ msgstr "Enderbury (Illas Phoenix)" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/gu.po tzdata-2023c/debian/po/gu.po --- tzdata-2023c/debian/po/gu.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/gu.po 2023-04-26 13:51:32.000000000 +0200 @@ -2334,13 +2334,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "રંગૂન" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "રીયાધ" @@ -3152,6 +3145,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "એન્ડરબરી" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "ફાકાઓફો" @@ -3466,9 +3466,6 @@ msgid "Mountain" msgstr "માઉન્ટેન" -#~ msgid "Enderbury" -#~ msgstr "એન્ડરબરી" - #~ msgid "SystemV" #~ msgstr "સિસ્ટમV" diff -Nru tzdata-2023c/debian/po/he.po tzdata-2023c/debian/po/he.po --- tzdata-2023c/debian/po/he.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/he.po 2023-04-26 13:51:32.000000000 +0200 @@ -2336,13 +2336,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "ראנגון" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "ריאד" @@ -3154,6 +3147,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "אנדרבורי (איי פניקס)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "קפאופו" @@ -3468,9 +3468,6 @@ msgid "Mountain" msgstr "אזור ההרים" -#~ msgid "Enderbury" -#~ msgstr "אנדרבורי (איי פניקס)" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/hr.po tzdata-2023c/debian/po/hr.po --- tzdata-2023c/debian/po/hr.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/hr.po 2023-04-26 13:51:32.000000000 +0200 @@ -2354,13 +2354,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijad" @@ -3174,6 +3167,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3496,9 +3496,6 @@ msgid "Mountain" msgstr "Moncton" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/hu.po tzdata-2023c/debian/po/hu.po --- tzdata-2023c/debian/po/hu.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/hu.po 2023-04-26 13:51:32.000000000 +0200 @@ -2334,13 +2334,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijád" @@ -3152,6 +3145,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury (Főnix-szigetek)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3466,9 +3466,6 @@ msgid "Mountain" msgstr "Mountain" -#~ msgid "Enderbury" -#~ msgstr "Enderbury (Főnix-szigetek)" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/id.po tzdata-2023c/debian/po/id.po --- tzdata-2023c/debian/po/id.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/id.po 2023-04-26 13:51:32.000000000 +0200 @@ -2352,13 +2352,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" @@ -3170,6 +3163,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury (Kep. Phoenix)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3484,9 +3484,6 @@ msgid "Mountain" msgstr "Mountain" -#~ msgid "Enderbury" -#~ msgstr "Enderbury (Kep. Phoenix)" - #~ msgid "SystemV" #~ msgstr "Sistem V" diff -Nru tzdata-2023c/debian/po/it.po tzdata-2023c/debian/po/it.po --- tzdata-2023c/debian/po/it.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/it.po 2023-04-26 13:51:32.000000000 +0200 @@ -2327,13 +2327,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Yangon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyad" @@ -3145,6 +3138,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3459,9 +3459,6 @@ msgid "Mountain" msgstr "Mountain" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/ja.po tzdata-2023c/debian/po/ja.po --- tzdata-2023c/debian/po/ja.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/ja.po 2023-04-26 13:51:32.000000000 +0200 @@ -2326,13 +2326,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "ラングーン" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "リヤド" @@ -3138,6 +3131,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "エンダーベリー" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "ファカオフォ" @@ -3452,9 +3452,6 @@ msgid "Mountain" msgstr "マウンテン" -#~ msgid "Enderbury" -#~ msgstr "エンダーベリー" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/ko.po tzdata-2023c/debian/po/ko.po --- tzdata-2023c/debian/po/ko.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/ko.po 2023-04-26 13:51:32.000000000 +0200 @@ -2325,13 +2325,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "양곤" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "리야드" @@ -3135,6 +3128,13 @@ #. Type: select #. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "" + +#. Type: select +#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/ku.po tzdata-2023c/debian/po/ku.po --- tzdata-2023c/debian/po/ku.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/ku.po 2023-04-26 13:51:32.000000000 +0200 @@ -2349,13 +2349,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyad" @@ -3169,6 +3162,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3487,9 +3487,6 @@ msgid "Mountain" msgstr "" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/lt.po tzdata-2023c/debian/po/lt.po --- tzdata-2023c/debian/po/lt.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/lt.po 2023-04-26 13:51:32.000000000 +0200 @@ -2344,13 +2344,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangūnas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijadas" @@ -3164,6 +3157,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderberis" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo sala" @@ -3482,9 +3482,6 @@ msgid "Mountain" msgstr "" -#~ msgid "Enderbury" -#~ msgstr "Enderberis" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/ml.po tzdata-2023c/debian/po/ml.po --- tzdata-2023c/debian/po/ml.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/ml.po 2023-04-26 13:51:32.000000000 +0200 @@ -2351,13 +2351,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "റംഗൂണ്‍" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "റിയാദ്" @@ -3171,6 +3164,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "എന്‍ഡെര്‍ബറി" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "ഫകവോഫോ" @@ -3489,9 +3489,6 @@ msgid "Mountain" msgstr "" -#~ msgid "Enderbury" -#~ msgstr "എന്‍ഡെര്‍ബറി" - #~ msgid "SystemV" #~ msgstr "സിസ്റ്റംV" diff -Nru tzdata-2023c/debian/po/nl.po tzdata-2023c/debian/po/nl.po --- tzdata-2023c/debian/po/nl.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/nl.po 2023-04-26 13:51:32.000000000 +0200 @@ -2330,13 +2330,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" @@ -3140,6 +3133,13 @@ #. Type: select #. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "" + +#. Type: select +#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/pl.po tzdata-2023c/debian/po/pl.po --- tzdata-2023c/debian/po/pl.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/pl.po 2023-04-26 13:51:32.000000000 +0200 @@ -2331,13 +2331,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangun" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijad" @@ -3143,6 +3136,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3457,9 +3457,6 @@ msgid "Mountain" msgstr "Czas górski" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "(wg stref System V)" 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 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/pt_BR.po 2023-04-26 13:51:32.000000000 +0200 @@ -2332,13 +2332,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" @@ -3144,6 +3137,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3458,9 +3458,6 @@ msgid "Mountain" msgstr "Moutain" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/pt.po tzdata-2023c/debian/po/pt.po --- tzdata-2023c/debian/po/pt.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/pt.po 2023-04-26 13:51:32.000000000 +0200 @@ -2331,13 +2331,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riade" @@ -3143,6 +3136,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3457,9 +3457,6 @@ msgid "Mountain" msgstr "Montanha" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/ru.po tzdata-2023c/debian/po/ru.po --- tzdata-2023c/debian/po/ru.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/ru.po 2023-04-26 13:51:32.000000000 +0200 @@ -2334,13 +2334,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Янгон" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Эр-Рияд" @@ -3146,6 +3139,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Эндербери" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Факаофо" @@ -3460,9 +3460,6 @@ msgid "Mountain" msgstr "Горное" -#~ msgid "Enderbury" -#~ msgstr "Эндербери" - #~ msgid "SystemV" #~ msgstr "В соответствии с SystemV" diff -Nru tzdata-2023c/debian/po/sk.po tzdata-2023c/debian/po/sk.po --- tzdata-2023c/debian/po/sk.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/sk.po 2023-04-26 13:51:32.000000000 +0200 @@ -2330,13 +2330,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijád" @@ -3148,6 +3141,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3462,9 +3462,6 @@ msgid "Mountain" msgstr "Americké horské" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "Konvencie SystemV" diff -Nru tzdata-2023c/debian/po/sq.po tzdata-2023c/debian/po/sq.po --- tzdata-2023c/debian/po/sq.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/sq.po 2023-04-26 13:51:32.000000000 +0200 @@ -2350,13 +2350,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" @@ -3170,6 +3163,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3486,9 +3486,6 @@ msgid "Mountain" msgstr "Mal" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/sv.po tzdata-2023c/debian/po/sv.po --- tzdata-2023c/debian/po/sv.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/sv.po 2023-04-26 13:51:32.000000000 +0200 @@ -2328,13 +2328,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" @@ -3146,6 +3139,13 @@ #. Type: select #. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "" + +#. Type: select +#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/templates.pot tzdata-2023c/debian/po/templates.pot --- tzdata-2023c/debian/po/templates.pot 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/templates.pot 2023-04-26 13:51:32.000000000 +0200 @@ -2324,13 +2324,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "" @@ -3133,6 +3126,13 @@ msgstr "" #. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "" + +#. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 diff -Nru tzdata-2023c/debian/po/th.po tzdata-2023c/debian/po/th.po --- tzdata-2023c/debian/po/th.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/th.po 2023-04-26 13:51:32.000000000 +0200 @@ -2326,13 +2326,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "ย่างกุ้ง" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "ริยาด" @@ -3141,6 +3134,13 @@ msgstr "" #. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "" + +#. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 diff -Nru tzdata-2023c/debian/po/tr.po tzdata-2023c/debian/po/tr.po --- tzdata-2023c/debian/po/tr.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/tr.po 2023-04-26 13:51:32.000000000 +0200 @@ -2328,13 +2328,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Yangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyad" @@ -3140,6 +3133,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3454,9 +3454,6 @@ msgid "Mountain" msgstr "Mountain" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/vi.po tzdata-2023c/debian/po/vi.po --- tzdata-2023c/debian/po/vi.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/vi.po 2023-04-26 13:51:32.000000000 +0200 @@ -2350,13 +2350,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" @@ -3170,6 +3163,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3488,9 +3488,6 @@ msgid "Mountain" msgstr "" -#~ msgid "Enderbury" -#~ msgstr "Enderbury" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/po/wo.po tzdata-2023c/debian/po/wo.po --- tzdata-2023c/debian/po/wo.po 2023-04-13 14:59:39.000000000 +0200 +++ tzdata-2023c/debian/po/wo.po 2023-04-26 13:51:32.000000000 +0200 @@ -2343,13 +2343,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Raŋguun" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyaad" @@ -3163,6 +3156,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Enderbury" +msgstr "Enderbury (îles Phoenix)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Fakaofo" msgstr "Fakaofo" @@ -3481,9 +3481,6 @@ msgid "Mountain" msgstr "" -#~ msgid "Enderbury" -#~ msgstr "Enderbury (îles Phoenix)" - #~ msgid "SystemV" #~ msgstr "SystemV" diff -Nru tzdata-2023c/debian/rules tzdata-2023c/debian/rules --- tzdata-2023c/debian/rules 2023-04-13 14:59:25.000000000 +0200 +++ tzdata-2023c/debian/rules 2023-04-26 13:51:32.000000000 +0200 @@ -73,7 +73,7 @@ fi ; \ cd $(CURDIR)/tzgen/$$i ; \ find . -maxdepth 2 -type f -o -type l | sed -e 's#^\./##' | \ - egrep -v '^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator|Faeroe|ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West|Argentina/ComodRivadavia|Buenos_Aires|Catamarca|Cordoba|Jujuy|Mendoza|Rosario|Louisville|Fort_Wayne|Indianapolis|Knox_IN|East-Indiana|East-Starke|Asmera|South_Pole|Saigon|Calcutta|Katmandu|Pacific-New|Enderbury|Kiev)$$' | \ + egrep -v '^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator|Faeroe|ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West|Argentina/ComodRivadavia|Buenos_Aires|Catamarca|Cordoba|Jujuy|Mendoza|Rosario|Louisville|Fort_Wayne|Indianapolis|Knox_IN|East-Indiana|East-Starke|Asmera|South_Pole|Saigon|Calcutta|Katmandu|Pacific-New|Kiev|Rangoon)$$' | \ sort -n | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $$#\n#' ; \ echo "_Description: Time zone:" ; \ echo " Please select the city or region corresponding to your time zone." ; \ @@ -90,6 +90,7 @@ # The upstream tests are related to the sources. Just skip it. override_dh_auto_test: + debian/test_timezone_conversions -z "$(TZGEN)" PYTHONTZPATH="$(TZGEN)" debian/tests/python override_dh_auto_install: diff -Nru tzdata-2023c/debian/tests/control tzdata-2023c/debian/tests/control --- tzdata-2023c/debian/tests/control 2023-04-13 14:50:18.000000000 +0200 +++ tzdata-2023c/debian/tests/control 2023-04-26 13:51:32.000000000 +0200 @@ -5,3 +5,8 @@ Tests: python-icu Depends: python3, python3-icu, tzdata Restrictions: allow-stderr + +Test-command: debian/test_timezone_conversions -d /var/lib/dpkg/info/ +Depends: python3, python3-debian, tzdata +Restrictions: allow-stderr superficial +Features: test-name=test_timezone_conversions diff -Nru tzdata-2023c/debian/test_timezone_conversions tzdata-2023c/debian/test_timezone_conversions --- tzdata-2023c/debian/test_timezone_conversions 1970-01-01 01:00:00.000000000 +0100 +++ tzdata-2023c/debian/test_timezone_conversions 2023-04-26 13:51:32.000000000 +0200 @@ -0,0 +1,180 @@ +#!/usr/bin/python3 + +# Author: Benjamin Drung + +"""Check convert_timezone from tzdata.config for consistency.""" + +import argparse +import logging +import pathlib +import re +import subprocess +import sys +import typing +import zoneinfo + +import debian.deb822 + +LOG_FORMAT = "%(levelname)s: %(message)s" +# Special timezones that should not be selectable in debconf +SPECIAL = {"Factory", "localtime"} + + +class ConvertTimezone: + """Wrap convert_timezone from tzdata.config.""" + + def __init__(self, tzdata_config: pathlib.Path): + self.tzdata_config = tzdata_config + content = tzdata_config.read_text(encoding="utf-8") + match = re.search(r"convert_timezone\(\).*\n}", content, flags=re.DOTALL) + assert match, f"convert_timezone function not found in {tzdata_config}" + self.convert_timezone = match.group(0) + + def __call__(self, timezone: str) -> str: + shell_script = f"{self.convert_timezone}\nconvert_timezone '{timezone}'\n" + shell = subprocess.run( + ["/bin/sh", "-c", shell_script], + capture_output=True, + check=True, + encoding="utf-8", + ) + return shell.stdout.strip() + + def filter_converted_timezones(self, timezones: set[str]) -> set[str]: + """Return set of timezones that will be converted by convert_timezone.""" + converted = set() + for timezone in timezones: + if self(timezone) != timezone: + converted.add(timezone) + return converted + + def filter_unconverted_timezones(self, timezones: set[str]) -> set[str]: + """Return set of timezones that will not be converted by convert_timezone.""" + return timezones - self.filter_converted_timezones(timezones) + + def get_targets(self) -> set[str]: + """Return set of conversion targets.""" + targets = set(re.findall('echo "([^"$]+)"', self.convert_timezone)) + logging.getLogger(__name__).info( + "Available conversion targets in %s: %i", self.tzdata_config, len(targets) + ) + return targets + + +def get_available_timezones(directory: typing.Optional[pathlib.Path]) -> set[str]: + """Return a set of available timezones in the directory. + + If directory is not set, use the sytem's default. + """ + logger = logging.getLogger(__name__) + if directory: + zoneinfo.reset_tzpath(to=[directory.absolute()]) + available = set(zoneinfo.available_timezones()) + if not available: + logger.error("Found no timezones in %s.", directory) + sys.exit(1) + logger.info("Available timezones in %s: %i", directory or "system", len(available)) + return available + + +def get_debconf_choices(template_filename: pathlib.Path) -> set[str]: + """Extract the timezone choices from the debconf template.""" + logger = logging.getLogger(__name__) + debconf_choices = set() + with template_filename.open(encoding="utf-8") as template_file: + for paragraph in debian.deb822.Deb822.iter_paragraphs(template_file): + area_match = re.match("tzdata/Zones/(.*)", paragraph["Template"]) + if not area_match: + continue + area = area_match.group(1) + choices = paragraph.get("Choices", paragraph.get("__Choices", "")) + debconf_choices.update([f"{area}/{c}" for c in choices.split(", ")]) + if not debconf_choices: + logger.error("Found no selectable timezones in %s.", template_filename) + sys.exit(1) + logger.info( + "Selectable timezones in %s: %i", template_filename, len(debconf_choices) + ) + return debconf_choices + + +def existing_dir_path(string: str) -> pathlib.Path: + """Convert string to existing dir path or raise ArgumentTypeError.""" + path = pathlib.Path(string) + if not path.is_dir(): + raise argparse.ArgumentTypeError(f"Directory {string} does not exist") + return path + + +def parse_args() -> argparse.Namespace: + """Parse command line arguments and return namespace.""" + parser = argparse.ArgumentParser() + parser.add_argument( + "-z", + "--zoneinfo-directory", + type=existing_dir_path, + help="Directory containing the generated zoneinfo files (default: system)", + ) + parser.add_argument( + "-d", + "--debian-directory", + default=pathlib.Path("debian"), + type=existing_dir_path, + help="Path to debian directory containing tzdata.config" + " and tzdata.templates (default: %(default)s)", + ) + return parser.parse_args() + + +def main() -> int: + """Check convert_timezone from tzdata.config for consistency.""" + args = parse_args() + logging.basicConfig(format=LOG_FORMAT, level=logging.INFO) + logger = logging.getLogger(__name__) + + selectable = get_debconf_choices(args.debian_directory / "tzdata.templates") + available = get_available_timezones(args.zoneinfo_directory) + convert_timezone = ConvertTimezone(args.debian_directory / "tzdata.config") + conversion_targets = convert_timezone.get_targets() + failures = 0 + + converted = convert_timezone.filter_converted_timezones(selectable) + if converted: + logger.error( + "Following %i timezones can be selected, but will be converted:\n%s", + len(converted), + "\n".join(sorted(converted)), + ) + failures += 1 + + unselectable = available - selectable + missing = convert_timezone.filter_unconverted_timezones(unselectable) - SPECIAL + if missing: + logger.warning( + "Following %i timezones cannot be selected, but are not converted:\n%s", + len(missing), + "\n".join(sorted(missing)), + ) + + targets = conversion_targets - available + if targets: + logger.error( + "Following %i timezones are conversion targets, but are not available:\n%s", + len(targets), + "\n".join(sorted(targets)), + ) + failures += 1 + + targets = conversion_targets - selectable + if targets: + logger.warning( + "Following %i timezones are conversion targets, but are not selectable:\n%s", + len(targets), + "\n".join(sorted(targets)), + ) + + return failures + + +if __name__ == "__main__": + sys.exit(main()) diff -Nru tzdata-2023c/debian/tzdata.config tzdata-2023c/debian/tzdata.config --- tzdata-2023c/debian/tzdata.config 2023-04-13 14:58:05.000000000 +0200 +++ tzdata-2023c/debian/tzdata.config 2023-04-26 13:51:32.000000000 +0200 @@ -167,12 +167,6 @@ "Europe/Kiev") echo "Europe/Kyiv" ;; - "Europe/Uzhgorod") - echo "Europe/Kyiv" - ;; - "Europe/Zaporozhye") - echo "Europe/Kyiv" - ;; "GB") echo "Europe/London" ;; @@ -234,13 +228,13 @@ echo "America/Mexico_City" ;; "Mideast/Riyadh87") - echo "Asia/Riyadh87" + echo "Asia/Riyadh" ;; "Mideast/Riyadh88") - echo "Asia/Riyadh88" + echo "Asia/Riyadh" ;; "Mideast/Riyadh89") - echo "Asia/Riyadh89" + echo "Asia/Riyadh" ;; "MST") echo "America/Phoenix" @@ -326,42 +320,9 @@ "Universal") echo "Etc/UTC" ;; - "US/Alaska") - echo "America/Anchorage" - ;; - "US/Aleutian") - echo "America/Adak" - ;; - "US/Arizona") - echo "America/Phoenix" - ;; - "US/Central") - echo "America/Chicago" - ;; "US/East-Indiana") echo "America/Indianapolis" ;; - "US/Eastern") - echo "America/New_York" - ;; - "US/Hawaii") - echo "Pacific/Honolulu" - ;; - "US/Indiana-Starke") - echo "America/Indianapolis" - ;; - "US/Michigan") - echo "America/Detroit" - ;; - "US/Mountain") - echo "America/Denver" - ;; - "US/Pacific") - echo "America/Los_Angeles" - ;; - "US/Samoa") - echo "Pacific/Pago_Pago" - ;; "UTC") echo "Etc/UTC" ;; diff -Nru tzdata-2023c/debian/tzdata.templates tzdata-2023c/debian/tzdata.templates --- tzdata-2023c/debian/tzdata.templates 2023-04-13 14:59:54.000000000 +0200 +++ tzdata-2023c/debian/tzdata.templates 2023-04-26 13:51:32.000000000 +0200 @@ -53,7 +53,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, 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 _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -85,7 +85,7 @@ Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Apia, Auckland, Bougainville, Chatham, Chuuk, Easter, Efate, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kanton, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Pohnpei, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap +__Choices: Apia, Auckland, Bougainville, Chatham, Chuuk, Easter, Efate, Enderbury, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kanton, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Pohnpei, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap _Description: Time zone: Please select the city or region corresponding to your time zone.