Bug#1060130: bullseye-pu: package libmateweather/1.24.1-1+deb11u1
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: libmateweather@packages.debian.org
Control: affects -1 + src:libmateweather
Please unblock the recent bullseye-pu upload of libmateweather.
[ Reason ]
Main reason for providing the pu is that Aviation Weather changed their
data server URL for retrieving weather information from their servers.
While at it, more data changes have been cherry-picked from upstream (see
below).
[ Impact ]
If this pu does not get accepted, Debian users will have a broken
weather-applet on MATE desktop. No weather information can be retrieved.
[ Tests ]
Manually installed the new .deb version and tested the MATE weather applet
regarding the introduced changes (on a Debian (Edu) bullseye system).
[ Risks ]
Regressions are always possible. MATE users will be affected. Esp. when using
weather reports on their desktop.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
[ Other info ]
(Anything else the release team should know.)
diff -Nru libmateweather-1.24.1/debian/changelog libmateweather-1.24.1/debian/changelog
--- libmateweather-1.24.1/debian/changelog 2020-08-21 23:20:54.000000000 +0200
+++ libmateweather-1.24.1/debian/changelog 2023-12-13 14:48:25.000000000 +0100
@@ -1,3 +1,23 @@
+libmateweather (1.24.1-1+deb11u1) bullseye; urgency=medium
+
+ * debian/patches: Cherry-pick upstream fixes from libmateweather 1.24 branch:
+ + add 0001_add-two-brazilian-cities.patch
+ + add 0002_remove-Berlin-Tegel.patch
+ * debian/patches: Cherry-pick upstream fixes from libmateweather 1.26 branch:
+ + add (and comment out) 0011_Kyiv-timezone.patch (tzdata in bullseye
+ still uses the old Europe/Kiew
+ + add city: 0012_add-San-Miguel-de-Tucuman-Argentina.patch
+ + update Chicago area codes: 0013_Chicago-area-updates.patch
+ + update data server URL: 0014_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
+ + Add follow-up patch 0014b_The-url-with-www.-is-a-permanent-redirect-308-
+ to-the.patch. The url with 'www.aviationweather.gov' is a permanent
+ redirect (308) to the url without 'www.'.
+
+ -- Mike Gabriel <sunweaver@debian.org> Wed, 13 Dec 2023 14:48:25 +0100
+
libmateweather (1.24.1-1) unstable; urgency=medium
[ Martin Wimpress ]
diff -Nru libmateweather-1.24.1/debian/patches/0001_add-two-brazilian-cities.patch libmateweather-1.24.1/debian/patches/0001_add-two-brazilian-cities.patch
--- libmateweather-1.24.1/debian/patches/0001_add-two-brazilian-cities.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/0001_add-two-brazilian-cities.patch 2023-12-13 14:48:25.000000000 +0100
@@ -0,0 +1,47 @@
+From 90cc76a2b0e8d57ec17a5ca81d00fa7e6808076a Mon Sep 17 00:00:00 2001
+From: raveit65 <mate@raveit.de>
+Date: Wed, 7 Apr 2021 21:41:14 +0200
+Subject: [PATCH] add 2 brazil cities
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- Joinville and São Bento do Sul
+- fixes https://github.com/mate-desktop/libmateweather/issues/94
+---
+ data/Locations.xml.in | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/data/Locations.xml.in b/data/Locations.xml.in
+index a80dacd1..19b61c00 100644
+--- a/data/Locations.xml.in
++++ b/data/Locations.xml.in
+@@ -9787,6 +9787,28 @@
+ <coordinates>-27.666667 -48.550000</coordinates>
+ </location>
+ </city>
++ <city>
++ <!-- A city in Santa Catarina in Brazil -->
++ <name>Joinville</name>
++ <coordinates>-26.30444 -48.84556</coordinates>
++ <location>
++ <name>Joinville Airport</name>
++ <code>SBJV</code>
++ <tz-hint>America/Sao_Paulo</tz-hint>
++ <coordinates>-26.22444 -48.79722</coordinates>
++ </location>
++ </city>
++ <city>
++ <!-- A city in Santa Catarina in Brazil -->
++ <name>São Bento do Sul</name>
++ <coordinates>-26.25028 -49.37861</coordinates>
++ <location>
++ <name>São Bento do Sul</name>
++ <code>SBSB</code>
++ <tz-hint>America/Sao_Paulo</tz-hint>
++ <coordinates>-26.25028 -49.37861</coordinates>
++ </location>
++ </city>
+ </state>
+ <state>
+ <!-- A state/province/territory in Brazil -->
diff -Nru libmateweather-1.24.1/debian/patches/0002_remove-Berlin-Tegel.patch libmateweather-1.24.1/debian/patches/0002_remove-Berlin-Tegel.patch
--- libmateweather-1.24.1/debian/patches/0002_remove-Berlin-Tegel.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/0002_remove-Berlin-Tegel.patch 2023-12-13 14:48:25.000000000 +0100
@@ -0,0 +1,30 @@
+From 74c7f241a34e85b1aa33daa9fd595b17b65756c1 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Tue, 6 Jul 2021 15:50:47 +0200
+Subject: [PATCH] locations: drop Berlin Tegel
+
+Berlin Tegel Airport shut down on 4th of May 2021 and will be converted
+into the 'Urban Tech Republic' quarters.
+
+It currently serves as a COVID-19 vaccination center, it is no longer an
+airport.
+---
+ data/Locations.xml.in | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/data/Locations.xml.in b/data/Locations.xml.in
+index 19b61c00..de1f5b33 100644
+--- a/data/Locations.xml.in
++++ b/data/Locations.xml.in
+@@ -14724,11 +14724,6 @@
+ <!-- The capital of Germany -->
+ <name msgctxt="City in Berlin, Germany">Berlin</name>
+ <coordinates>52.516667 13.400000</coordinates>
+- <location>
+- <name>Berlin-Tegel</name>
+- <code>EDDT</code>
+- <coordinates>52.566667 13.316667</coordinates>
+- </location>
+ <location>
+ <name>Berlin-Schoenefeld</name>
+ <code>EDDB</code>
diff -Nru libmateweather-1.24.1/debian/patches/0011_Kyiv-timezone.patch libmateweather-1.24.1/debian/patches/0011_Kyiv-timezone.patch
--- libmateweather-1.24.1/debian/patches/0011_Kyiv-timezone.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/0011_Kyiv-timezone.patch 2023-12-13 14:48:25.000000000 +0100
@@ -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.24.1/debian/patches/0012_add-San-Miguel-de-Tucuman-Argentina.patch libmateweather-1.24.1/debian/patches/0012_add-San-Miguel-de-Tucuman-Argentina.patch
--- libmateweather-1.24.1/debian/patches/0012_add-San-Miguel-de-Tucuman-Argentina.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/0012_add-San-Miguel-de-Tucuman-Argentina.patch 2023-12-13 14:48:25.000000000 +0100
@@ -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.24.1/debian/patches/0013_Chicago-area-updates.patch libmateweather-1.24.1/debian/patches/0013_Chicago-area-updates.patch
--- libmateweather-1.24.1/debian/patches/0013_Chicago-area-updates.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/0013_Chicago-area-updates.patch 2023-12-13 14:48:25.000000000 +0100
@@ -0,0 +1,90 @@
+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(-)
+
+--- 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>
diff -Nru libmateweather-1.24.1/debian/patches/0014b_The-url-with-www.-is-a-permanent-redirect-308-to-the.patch libmateweather-1.24.1/debian/patches/0014b_The-url-with-www.-is-a-permanent-redirect-308-to-the.patch
--- libmateweather-1.24.1/debian/patches/0014b_The-url-with-www.-is-a-permanent-redirect-308-to-the.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/0014b_The-url-with-www.-is-a-permanent-redirect-308-to-the.patch 2023-12-13 14:48:25.000000000 +0100
@@ -0,0 +1,27 @@
+From 5b068a6e73e96db512ca8c60a11d31c068a5375f Mon Sep 17 00:00:00 2001
+From: Olivier Gagnon <ogagnon@ludia.com>
+Date: Sun, 19 Nov 2023 13:47:25 -0500
+Subject: [PATCH] The url with 'www.' is a permanent redirect (308) to the url
+ without it
+
+Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+---
+ 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 0ae2cbb..7bc24fc 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/cgi-bin/data/dataserver.php";,
++ "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php";,
+ "dataSource", "metars",
+ "requestType", "retrieve",
+ "format", "xml",
+--
+2.39.2
+
diff -Nru libmateweather-1.24.1/debian/patches/0014_data-server-url-changed.patch libmateweather-1.24.1/debian/patches/0014_data-server-url-changed.patch
--- libmateweather-1.24.1/debian/patches/0014_data-server-url-changed.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/0014_data-server-url-changed.patch 2023-12-13 14:48:25.000000000 +0100
@@ -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.24.1/debian/patches/0015_fix-some-location-names.patch libmateweather-1.24.1/debian/patches/0015_fix-some-location-names.patch
--- libmateweather-1.24.1/debian/patches/0015_fix-some-location-names.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/0015_fix-some-location-names.patch 2023-12-13 14:48:25.000000000 +0100
@@ -0,0 +1,71 @@
+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(-)
+
+--- 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 -Nru libmateweather-1.24.1/debian/patches/0016_tbilisi-IATA-airport-code-changed.patch libmateweather-1.24.1/debian/patches/0016_tbilisi-IATA-airport-code-changed.patch
--- libmateweather-1.24.1/debian/patches/0016_tbilisi-IATA-airport-code-changed.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/0016_tbilisi-IATA-airport-code-changed.patch 2023-12-13 14:48:25.000000000 +0100
@@ -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.24.1/debian/patches/series libmateweather-1.24.1/debian/patches/series
--- libmateweather-1.24.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ libmateweather-1.24.1/debian/patches/series 2023-12-13 14:48:25.000000000 +0100
@@ -0,0 +1,9 @@
+0001_add-two-brazilian-cities.patch
+0002_remove-Berlin-Tegel.patch
+#0011_Kyiv-timezone.patch
+0012_add-San-Miguel-de-Tucuman-Argentina.patch
+0013_Chicago-area-updates.patch
+0014_data-server-url-changed.patch
+0014b_The-url-with-www.-is-a-permanent-redirect-308-to-the.patch
+0015_fix-some-location-names.patch
+0016_tbilisi-IATA-airport-code-changed.patch
Reply to: