Version in base suite: 1.26.0-1.1

Base version: libmateweather_1.26.0-1.1
Target version: libmateweather_1.26.0-1.1+deb12u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/libm/libmateweather/libmateweather_1.26.0-1.1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/libm/libmateweather/libmateweather_1.26.0-1.1+deb12u1.dsc

 changelog                                              |   13 
 patches/0001_Kyiv-timezone.patch                       |   32 ++
 patches/0002_add-San-Miguel-de-Tucuman-Argentina.patch |   42 +++
 patches/0003_Chicago-area-updates.patch                |   95 +++++++
 patches/0004_data-server-url-changed.patch             |   25 +
 patches/0005_fix-some-location-names.patch             |  222 +++++++++++++++++
 patches/0006_tbilisi-IATA-airport-code-changed.patch   |   26 +
 patches/series                                         |    7 
 patches/timezones.patch                                |   32 --
 9 files changed, 461 insertions(+), 33 deletions(-)

diff -Nru libmateweather-1.26.0/debian/changelog libmateweather-1.26.0/debian/changelog
--- libmateweather-1.26.0/debian/changelog	2022-10-15 15:45:15.000000000 +0000
+++ libmateweather-1.26.0/debian/changelog	2023-10-31 07:25:09.000000000 +0000
@@ -1,3 +1,16 @@
+libmateweather (1.26.0-1.1+deb12u1) bookworm; urgency=medium
+
+  * debian/patches: Cherry-pick (and re-arrange) upstream fixes.
+     + rename: timezones.patch => 0001_Kyiv-timezone.patch (100%)
+     + add city: 0002_add-San-Miguel-de-Tucuman-Argentina.patch
+     + update Chicago area codes: 0003_Chicago-area-updates.patch
+     + update data server URL: 0004_data-server-url-changed.patch (Closes:
+       #1054248, #1054268)
+     + typo fixes in location names: 0005_fix-some-location-names.patch
+     + new Tbilisi airport code: 0006_tbilisi-IATA-airport-code-changed.patch
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 31 Oct 2023 08:25:09 +0100
+
 libmateweather (1.26.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libmateweather-1.26.0/debian/patches/0001_Kyiv-timezone.patch libmateweather-1.26.0/debian/patches/0001_Kyiv-timezone.patch
--- libmateweather-1.26.0/debian/patches/0001_Kyiv-timezone.patch	1970-01-01 00:00:00.000000000 +0000
+++ libmateweather-1.26.0/debian/patches/0001_Kyiv-timezone.patch	2023-10-31 07:12:39.000000000 +0000
@@ -0,0 +1,32 @@
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Bug-Debian: https://bugs.debian.org/1017304
+Description: Update spelling of Kiev/Kyiv to match tzdata
+ tzdata 2022b-1 changed it from Kiev to Kyiv.
+
+--- a/data/Locations.xml.in
++++ b/data/Locations.xml.in
+@@ -20618,13 +20618,13 @@
+       <iso-code>UA</iso-code>
+       <fips-code>UP</fips-code>
+       <timezones>
+-        <timezone id="Europe/Kiev">
++        <timezone id="Europe/Kyiv">
+           <obsoletes>Europe/Simferopol</obsoletes>
+           <obsoletes>Europe/Uzhgorod</obsoletes>
+           <obsoletes>Europe/Zaporozhye</obsoletes>
+         </timezone>
+       </timezones>
+-      <tz-hint>Europe/Kiev</tz-hint>
++      <tz-hint>Europe/Kyiv</tz-hint>
+       <city>
+         <!-- A city in Ukraine -->
+         <name>Boryspil'</name>
+@@ -20700,7 +20700,7 @@
+              "Kiev" is the traditional English name.
+              The local name in Ukrainian is "Kyyiv".
+           -->
+-        <name>Kiev</name>
++        <name>Kyiv</name>
+         <coordinates>50.433333 30.516667</coordinates>
+         <location>
+           <name>Kyiv</name>
diff -Nru libmateweather-1.26.0/debian/patches/0002_add-San-Miguel-de-Tucuman-Argentina.patch libmateweather-1.26.0/debian/patches/0002_add-San-Miguel-de-Tucuman-Argentina.patch
--- libmateweather-1.26.0/debian/patches/0002_add-San-Miguel-de-Tucuman-Argentina.patch	1970-01-01 00:00:00.000000000 +0000
+++ libmateweather-1.26.0/debian/patches/0002_add-San-Miguel-de-Tucuman-Argentina.patch	2023-10-31 07:14:08.000000000 +0000
@@ -0,0 +1,42 @@
+From f0c9cc4764ec3d21ea0d8589c943635606aa2c09 Mon Sep 17 00:00:00 2001
+From: Rodolfo Guagnini <rodolfo.guagnini@gmail.com>
+Date: Mon, 4 Jul 2022 10:13:46 -0300
+Subject: locations: add San Miguel de Tucuman (Argentina)
+
+San Miguel is the capital city of an state of Argentina, and it has international airport with corresponding 4 letter code. I used other Argentina city as template, updated the name, the airport's code, latitud and longitude taken from wikipedia: https://en.wikipedia.org/wiki/Teniente_General_Benjam%C3%ADn_Matienzo_International_Airport
+---
+ data/Locations.xml.in | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/data/Locations.xml.in b/data/Locations.xml.in
+index de1f5b3..8bf9bad 100644
+--- a/data/Locations.xml.in
++++ b/data/Locations.xml.in
+@@ -8142,7 +8142,6 @@
+           <obsoletes>America/Argentina/Rio_Gallegos</obsoletes>
+           <obsoletes>America/Argentina/San_Juan</obsoletes>
+           <obsoletes>America/Argentina/San_Luis</obsoletes>
+-          <obsoletes>America/Argentina/Tucuman</obsoletes>
+           <obsoletes>America/Argentina/Ushuaia</obsoletes>
+         </timezone>
+       </timezones>
+@@ -8357,6 +8356,16 @@
+           <coordinates>-24.383333 -65.083333</coordinates>
+         </location>
+       </city>
++      <city>
++        <!-- A city in Argentina -->
++        <name>San Miguel de Tucuman</name>
++        <coordinates>-26.840833 -65.104722</coordinates>
++        <location>
++          <name>San Miguel de Tucuman</name>
++          <code>SANT</code>
++          <coordinates>-26.840833 -65.104722</coordinates>
++        </location>
++      </city>
+       <city>
+         <!-- A city in Argentina -->
+         <name>Ushuaia</name>
+-- 
+cgit v1.2.1
+
diff -Nru libmateweather-1.26.0/debian/patches/0003_Chicago-area-updates.patch libmateweather-1.26.0/debian/patches/0003_Chicago-area-updates.patch
--- libmateweather-1.26.0/debian/patches/0003_Chicago-area-updates.patch	1970-01-01 00:00:00.000000000 +0000
+++ libmateweather-1.26.0/debian/patches/0003_Chicago-area-updates.patch	2023-10-31 07:15:03.000000000 +0000
@@ -0,0 +1,95 @@
+From f90c0fca0fe0564c88e0b13a7cc286a7d616dbdf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linas=20Vep=C5=A1tas?= <linasvepstas@gmail.com>
+Date: Sat, 15 Apr 2023 03:50:25 -0500
+Subject: Chicago area updates
+
+* Chicago area updates
+
+Some of the Chicago zones report:
+
+Note
+This is the final forecast issuance for the Cook County
+forecast zone (ILZ014). Subsequent Cook County forecasts will be
+issued for three new zones, Northern Cook County (ILZ103), Central
+Cook County (ILZ104) and Southern Cook County (ILZ105). For more
+information, please visit www.weather.gov/lot/Forecast_Zone_Change.
+
+That URL notes that the Chicago area changes in March 2020.
+I've updated based on the URL's
+https://forecast.weather.gov/MapClick.php?zoneid=ILZ103
+
+and likewise for ILZ104, ILZ105, etc.
+
+I understand Mate weather applet is in maintenance mode, but
+until the cut-over is done, all the current MATE distros are still
+shipping this (outdated) version.
+---
+ data/Locations.xml.in | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/data/Locations.xml.in b/data/Locations.xml.in
+index 8bf9bad..f9e11e0 100644
+--- a/data/Locations.xml.in
++++ b/data/Locations.xml.in
+@@ -34650,7 +34650,7 @@
+           <location>
+             <name>Chicago Midway Airport</name>
+             <code>KMDW</code>
+-            <zone>ILZ014</zone>
++            <zone>ILZ104</zone>
+             <radar>ord</radar>
+             <coordinates>41.784167 -87.755278</coordinates>
+           </location>
+@@ -34664,23 +34664,23 @@
+           <location>
+             <name>Lansing Municipal Airport</name>
+             <code>KIGQ</code>
+-            <zone>ILZ014</zone>
++            <zone>ILZ105</zone>
+             <radar>ord</radar>
+             <coordinates>41.540000 -87.532222</coordinates>
+           </location>
+           <location>
+-            <name>Chicago / Wheeling, Pal-Waukee Airport</name>
+-            <code>KPWK</code>
++            <name>Chicago Waukegan Regional Airport</name>
++            <code>KUGN</code>
+             <zone>ILZ006</zone>
+             <radar>ord</radar>
+-            <coordinates>42.120833 -87.904722</coordinates>
++            <coordinates>42.43 -87.86</coordinates>
+           </location>
+           <location>
+-            <name>Chicago / Romeoville, Lewis University Airport</name>
+-            <code>KLOT</code>
+-            <zone>ILZ014</zone>
++            <name>Chicago / Wheeling, Pal-Waukee Airport</name>
++            <code>KPWK</code>
++            <zone>ILZ103</zone>
+             <radar>ord</radar>
+-            <coordinates>41.608333 -88.094167</coordinates>
++            <coordinates>42.120833 -87.904722</coordinates>
+           </location>
+         </city>
+         <city>
+@@ -34955,7 +34955,7 @@
+           <location>
+             <name>Chicago / West Chicago, Dupage Airport</name>
+             <code>KDPA</code>
+-            <zone>ILZ014</zone>
++            <zone>ILZ013</zone>
+             <radar>ord</radar>
+             <coordinates>41.896389 -88.251111</coordinates>
+           </location>
+@@ -35157,7 +35157,7 @@
+           <location>
+             <name>Chicago / West Chicago, Dupage Airport</name>
+             <code>KDPA</code>
+-            <zone>ILZ014</zone>
++            <zone>ILZ013</zone>
+             <radar>ord</radar>
+             <coordinates>41.896389 -88.251111</coordinates>
+           </location>
+-- 
+cgit v1.2.1
+
diff -Nru libmateweather-1.26.0/debian/patches/0004_data-server-url-changed.patch libmateweather-1.26.0/debian/patches/0004_data-server-url-changed.patch
--- libmateweather-1.26.0/debian/patches/0004_data-server-url-changed.patch	1970-01-01 00:00:00.000000000 +0000
+++ libmateweather-1.26.0/debian/patches/0004_data-server-url-changed.patch	2023-10-31 07:15:35.000000000 +0000
@@ -0,0 +1,25 @@
+From b75056f5bccf506959a2075305f7e8abbb2502dd Mon Sep 17 00:00:00 2001
+From: Mike Ovchinnikov <mixao@yandex.ru>
+Date: Wed, 18 Oct 2023 14:59:53 +0400
+Subject: Dataserver url changed
+
+---
+ libmateweather/weather-metar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmateweather/weather-metar.c b/libmateweather/weather-metar.c
+index a9f3c84..0ae2cbb 100644
+--- a/libmateweather/weather-metar.c
++++ b/libmateweather/weather-metar.c
+@@ -550,7 +550,7 @@ metar_start_open (WeatherInfo *info)
+     }
+ 
+     msg = soup_form_request_new (
+-        "GET", "https://www.aviationweather.gov/adds/dataserver_current/httpparam",
++        "GET", "https://www.aviationweather.gov/cgi-bin/data/dataserver.php",
+         "dataSource", "metars",
+         "requestType", "retrieve",
+         "format", "xml",
+-- 
+cgit v1.2.1
+
diff -Nru libmateweather-1.26.0/debian/patches/0005_fix-some-location-names.patch libmateweather-1.26.0/debian/patches/0005_fix-some-location-names.patch
--- libmateweather-1.26.0/debian/patches/0005_fix-some-location-names.patch	1970-01-01 00:00:00.000000000 +0000
+++ libmateweather-1.26.0/debian/patches/0005_fix-some-location-names.patch	2023-10-31 07:20:54.000000000 +0000
@@ -0,0 +1,222 @@
+From d61ff9e3b20d2ad6a68e0687ededa3aee3c4fa1c Mon Sep 17 00:00:00 2001
+From: raveit65 <mate@raveit.de>
+Date: Wed, 18 Oct 2023 22:22:45 +0200
+Subject: fix some location names
+
+---
+ data/Locations.xml.in | 14 +++++++-------
+# libmateweather.pot    |  8 ++++----
+# locations.pot         | 35 ++++++++++++++++++-----------------
+ 3 files changed, 29 insertions(+), 28 deletions(-)
+
+diff --git a/data/Locations.xml.in b/data/Locations.xml.in
+index eca181a..cb37c4a 100644
+--- a/data/Locations.xml.in
++++ b/data/Locations.xml.in
+@@ -2954,7 +2954,7 @@
+       </city>
+       <city>
+         <!-- A city in Bangladesh -->
+-        <name>Solpur</name>
++        <name>Solapur</name>
+         <coordinates>23.850000 90.400000</coordinates>
+         <location>
+           <name>Kurmitola, Dia</name>
+@@ -9952,7 +9952,7 @@
+       </state>
+       <state>
+         <!-- A state/province/territory in Brazil -->
+-        <name>Tocantis</name>
++        <name>Tocantins</name>
+         <fips-code>BR31</fips-code>
+       </state>
+     </country>
+@@ -14785,10 +14785,10 @@
+              use that unless you know that it has a different name in
+              your language.
+           -->
+-        <name>Hesse</name>
++        <name>Hessen</name>
+         <fips-code>GM05</fips-code>
+         <city>
+-          <!-- A city in Hesse in Germany -->
++          <!-- A city in Hessen in Germany -->
+           <name>Frankfurt</name>
+           <coordinates>50.116667 8.683333</coordinates>
+           <location>
+@@ -14798,7 +14798,7 @@
+           </location>
+         </city>
+         <city>
+-          <!-- A city in Hesse in Germany -->
++          <!-- A city in Hessen in Germany -->
+           <name>Fritzlar</name>
+           <coordinates>51.133333 9.283333</coordinates>
+           <location>
+@@ -14808,7 +14808,7 @@
+           </location>
+         </city>
+         <city>
+-          <!-- A city in Hesse in Germany -->
++          <!-- A city in Hessen in Germany -->
+           <name>Kassel</name>
+           <coordinates>51.316667 9.500000</coordinates>
+           <location>
+@@ -14818,7 +14818,7 @@
+           </location>
+         </city>
+         <city>
+-          <!-- A city in Hesse in Germany -->
++          <!-- A city in Hessen in Germany -->
+           <name>Wiesbaden</name>
+           <coordinates>50.083333 8.250000</coordinates>
+           <location>
+#diff --git a/libmateweather.pot b/libmateweather.pot
+#index 8c91a48..133976b 100644
+#--- a/libmateweather.pot
+#+++ b/libmateweather.pot
+#@@ -5,9 +5,9 @@
+# #
+# msgid ""
+# msgstr ""
+#-"Project-Id-Version: libmateweather 1.25.0\n"
+#+"Project-Id-Version: libmateweather 1.26.1\n"
+# "Report-Msgid-Bugs-To: https://mate-desktop.org\n"
+#-"POT-Creation-Date: 2021-08-03 20:41+0200\n"
+#+"POT-Creation-Date: 2023-10-18 22:20+0200\n"
+# "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+# "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+# "Language-Team: LANGUAGE <LL@li.org>\n"
+#@@ -352,8 +352,8 @@ msgstr ""
+# 
+# #: libmateweather/org.mate.weather.gschema.xml.in:167
+# msgid ""
+#-"If true, then retrieve a radar map from a location specified by the \"radar"
+#-"\" key."
+#+"If true, then retrieve a radar map from a location specified by the "
+#+"\"radar\" key."
+# msgstr ""
+# 
+# #: libmateweather/org.mate.weather.gschema.xml.in:171
+#diff --git a/locations.pot b/locations.pot
+#index 493d755..0ea295e 100644
+#--- a/locations.pot
+#+++ b/locations.pot
+#@@ -8,7 +8,7 @@ msgid ""
+# msgstr ""
+# "Project-Id-Version: PACKAGE VERSION\n"
+# "Report-Msgid-Bugs-To: \n"
+#-"POT-Creation-Date: 2021-12-11 14:47+0100\n"
+#+"POT-Creation-Date: 2023-10-18 22:20+0200\n"
+# "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+# "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+# "Language-Team: LANGUAGE <LL@li.org>\n"
+#@@ -1517,6 +1517,7 @@ msgstr ""
+# #. details. This string is only used in places where
+# #. "Brazil" is already clear from context.
+# #.
+#+#. A state/province/territory in Brazil
+# msgid "Tocantins"
+# msgstr ""
+# 
+#@@ -2145,10 +2146,6 @@ msgctxt "State in Brazil"
+# msgid "São Paulo"
+# msgstr ""
+# 
+#-#. A state/province/territory in Brazil
+#-msgid "Tocantis"
+#-msgstr ""
+#-
+# #. A state/province/territory in Canada
+# msgid "Alberta"
+# msgstr ""
+#@@ -2348,7 +2345,7 @@ msgstr ""
+# #. use that unless you know that it has a different name in
+# #. your language.
+# #.
+#-msgid "Hesse"
+#+msgid "Hessen"
+# msgstr ""
+# 
+# #. A state in Germany.  The local name is "Niedersachsen".
+#@@ -3049,6 +3046,10 @@ msgctxt "City in Argentina"
+# msgid "San Fernando"
+# msgstr ""
+# 
+#+#. A city in Argentina
+#+msgid "San Miguel de Tucuman"
+#+msgstr ""
+#+
+# #. A city in Argentina
+# msgid "San Salvador de Jujuy"
+# msgstr ""
+#@@ -3293,7 +3294,7 @@ msgid "Dhaka"
+# msgstr ""
+# 
+# #. A city in Bangladesh
+#-msgid "Solpur"
+#+msgid "Solapur"
+# msgstr ""
+# 
+# #. The capital of Barbados
+#@@ -6895,7 +6896,7 @@ msgstr ""
+# msgid "Faßberg"
+# msgstr ""
+# 
+#-#. A city in Hesse in Germany
+#+#. A city in Hessen in Germany
+# msgid "Frankfurt"
+# msgstr ""
+# 
+#@@ -6903,7 +6904,7 @@ msgstr ""
+# msgid "Friedrichshafen"
+# msgstr ""
+# 
+#-#. A city in Hesse in Germany
+#+#. A city in Hessen in Germany
+# msgid "Fritzlar"
+# msgstr ""
+# 
+#@@ -6952,7 +6953,7 @@ msgstr ""
+# msgid "Karlsruhe"
+# msgstr ""
+# 
+#-#. A city in Hesse in Germany
+#+#. A city in Hessen in Germany
+# msgid "Kassel"
+# msgstr ""
+# 
+#@@ -7101,7 +7102,7 @@ msgstr ""
+# msgid "Westerland"
+# msgstr ""
+# 
+#-#. A city in Hesse in Germany
+#+#. A city in Hessen in Germany
+# msgid "Wiesbaden"
+# msgstr ""
+# 
+#@@ -11760,15 +11761,15 @@ msgstr ""
+# msgid "Kharkiv"
+# msgstr ""
+# 
+#+#. A city in Ukraine
+#+msgid "Kryvyy Rih"
+#+msgstr ""
+#+
+# #. The capital of Ukraine.
+#-#. "Kiev" is the traditional English name.
+#+#. "Kyiv" is the traditional English name.
+# #. The local name in Ukrainian is "Kyyiv".
+# #.
+#-msgid "Kiev"
+#-msgstr ""
+#-
+#-#. A city in Ukraine
+#-msgid "Kryvyy Rih"
+#+msgid "Kyiv"
+# msgstr ""
+# 
+# #. A city in Ukraine
+-- 
+cgit v1.2.1
+
diff -Nru libmateweather-1.26.0/debian/patches/0006_tbilisi-IATA-airport-code-changed.patch libmateweather-1.26.0/debian/patches/0006_tbilisi-IATA-airport-code-changed.patch
--- libmateweather-1.26.0/debian/patches/0006_tbilisi-IATA-airport-code-changed.patch	1970-01-01 00:00:00.000000000 +0000
+++ libmateweather-1.26.0/debian/patches/0006_tbilisi-IATA-airport-code-changed.patch	2023-10-31 07:12:58.000000000 +0000
@@ -0,0 +1,26 @@
+From 7e48e04c60db13a133cc74dfc8e9feb029e75f58 Mon Sep 17 00:00:00 2001
+From: Mike Ovchinnikov <mixao@yandex.ru>
+Date: Thu, 19 Oct 2023 15:32:53 +0400
+Subject: Tbilisi, Georgia (Country) IATA Airport code (TBS) changed to ICAO
+ code (UGTB)
+
+---
+ data/Locations.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Locations.xml.in b/data/Locations.xml.in
+index cb37c4a..da2d52a 100644
+--- a/data/Locations.xml.in
++++ b/data/Locations.xml.in
+@@ -3560,7 +3560,7 @@
+ 	  <coordinates>25.038889 102.718333</coordinates>
+ 	  <location>
+ 	    <name>Tbilisi</name>
+-	    <code>TBS</code>
++	    <code>UGTB</code>
+ 	    <coordinates>41.669167 44.954722</coordinates>
+ 	  </location>
+ 	</city>
+-- 
+cgit v1.2.1
+
diff -Nru libmateweather-1.26.0/debian/patches/series libmateweather-1.26.0/debian/patches/series
--- libmateweather-1.26.0/debian/patches/series	2022-10-15 15:45:08.000000000 +0000
+++ libmateweather-1.26.0/debian/patches/series	2023-10-31 07:17:48.000000000 +0000
@@ -1 +1,6 @@
-timezones.patch
+0001_Kyiv-timezone.patch
+0002_add-San-Miguel-de-Tucuman-Argentina.patch
+0003_Chicago-area-updates.patch
+0004_data-server-url-changed.patch
+0005_fix-some-location-names.patch
+0006_tbilisi-IATA-airport-code-changed.patch
diff -Nru libmateweather-1.26.0/debian/patches/timezones.patch libmateweather-1.26.0/debian/patches/timezones.patch
--- libmateweather-1.26.0/debian/patches/timezones.patch	2022-10-15 15:45:08.000000000 +0000
+++ libmateweather-1.26.0/debian/patches/timezones.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-Author: Reiner Herrmann <reiner@reiner-h.de>
-Bug-Debian: https://bugs.debian.org/1017304
-Description: Update spelling of Kiev/Kyiv to match tzdata
- tzdata 2022b-1 changed it from Kiev to Kyiv.
-
---- a/data/Locations.xml.in
-+++ b/data/Locations.xml.in
-@@ -20618,13 +20618,13 @@
-       <iso-code>UA</iso-code>
-       <fips-code>UP</fips-code>
-       <timezones>
--        <timezone id="Europe/Kiev">
-+        <timezone id="Europe/Kyiv">
-           <obsoletes>Europe/Simferopol</obsoletes>
-           <obsoletes>Europe/Uzhgorod</obsoletes>
-           <obsoletes>Europe/Zaporozhye</obsoletes>
-         </timezone>
-       </timezones>
--      <tz-hint>Europe/Kiev</tz-hint>
-+      <tz-hint>Europe/Kyiv</tz-hint>
-       <city>
-         <!-- A city in Ukraine -->
-         <name>Boryspil'</name>
-@@ -20700,7 +20700,7 @@
-              "Kiev" is the traditional English name.
-              The local name in Ukrainian is "Kyyiv".
-           -->
--        <name>Kiev</name>
-+        <name>Kyiv</name>
-         <coordinates>50.433333 30.516667</coordinates>
-         <location>
-           <name>Kyiv</name>