Control: tags 1125830 + patch Control: tags 1125830 + pending Dear maintainer,
I've prepared an NMU for pyqso (versioned as 1.1.0-11.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for pyqso-1.1.0 pyqso-1.1.0 changelog | 9 + control | 3 patches/0001-Replace-deprecated-use-of-pkg_resources-with-calls-t.patch | 50 ++++++++++ patches/series | 1 4 files changed, 61 insertions(+), 2 deletions(-) diff -Nru pyqso-1.1.0/debian/changelog pyqso-1.1.0/debian/changelog --- pyqso-1.1.0/debian/changelog 2025-09-29 20:21:18.000000000 +0300 +++ pyqso-1.1.0/debian/changelog 2026-03-03 20:04:10.000000000 +0200 @@ -1,3 +1,12 @@ +pyqso (1.1.0-11.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream change to move away from python3-pkg-resources. + (Closes: #1125830) + * debian/control: Update Homepage. + + -- Adrian Bunk <[email protected]> Tue, 03 Mar 2026 20:04:10 +0200 + pyqso (1.1.0-11) unstable; urgency=medium * Use python3-pkg-resources for runtime dependency (Closes: #1116440) diff -Nru pyqso-1.1.0/debian/control pyqso-1.1.0/debian/control --- pyqso-1.1.0/debian/control 2025-09-29 20:21:18.000000000 +0300 +++ pyqso-1.1.0/debian/control 2026-03-03 20:04:10.000000000 +0200 @@ -13,7 +13,7 @@ Standards-Version: 4.7.2 Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/pyqso Vcs-Git: https://salsa.debian.org/debian-hamradio-team/pyqso.git -Homepage: https://christianjacobs.uk/pyqso +Homepage: https://github.com/ctjacobs/pyqso Rules-Requires-Root: no Package: pyqso @@ -25,7 +25,6 @@ python3-gi-cairo, python3-matplotlib, python3-numpy, - python3-pkg-resources, python3-zombie-telnetlib, libjs-jquery, libjs-underscore diff -Nru pyqso-1.1.0/debian/patches/0001-Replace-deprecated-use-of-pkg_resources-with-calls-t.patch pyqso-1.1.0/debian/patches/0001-Replace-deprecated-use-of-pkg_resources-with-calls-t.patch --- pyqso-1.1.0/debian/patches/0001-Replace-deprecated-use-of-pkg_resources-with-calls-t.patch 1970-01-01 02:00:00.000000000 +0200 +++ pyqso-1.1.0/debian/patches/0001-Replace-deprecated-use-of-pkg_resources-with-calls-t.patch 2026-03-03 20:04:10.000000000 +0200 @@ -0,0 +1,50 @@ +From 642e5bab8cedf2c7f3137ab934971f64ce71d17a Mon Sep 17 00:00:00 2001 +From: Christian Rodriguez Jacobs <[email protected]> +Date: Wed, 26 Feb 2025 18:59:43 +0000 +Subject: Replace deprecated use of pkg_resources with calls to + importlib.resources. + +--- + bin/pyqso | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/bin/pyqso b/bin/pyqso +index 71b68d1..d8c2cb3 100755 +--- a/bin/pyqso ++++ b/bin/pyqso +@@ -30,7 +30,7 @@ import os + import os.path + import sys + import signal +-import pkg_resources ++import importlib.resources + + import logging + logging.basicConfig(level=logging.INFO) +@@ -62,8 +62,9 @@ class PyQSO: + + # Get the PyQSO main window defined in the Glade file. + self.builder = Gtk.Builder() +- glade_file_path = pkg_resources.resource_filename("pyqso", os.path.join("res", "pyqso.glade")) +- self.builder.add_from_file(glade_file_path) ++ glade_file_path = importlib.resources.files("pyqso").joinpath("res", "pyqso.glade") ++ with importlib.resources.as_file(glade_file_path) as path: ++ self.builder.add_from_file(path.as_posix()) + self.window = self.builder.get_object("pyqso") + + # Check that the directory for holding PyQSO configuration files exists. If it doesn't, create it now. +@@ -132,8 +133,9 @@ class PyQSO: + + def show_about(self, widget): + """ Show the About dialog, which includes license information. """ +- glade_file_path = pkg_resources.resource_filename("pyqso", os.path.join("res", "pyqso.glade")) +- self.builder.add_objects_from_file(glade_file_path, ("about_dialog",)) ++ glade_file_path = importlib.resources.files("pyqso").joinpath("res", "pyqso.glade") ++ with importlib.resources.as_file(glade_file_path) as path: ++ self.builder.add_objects_from_file(path.as_posix(), ("about_dialog",)) + about = self.builder.get_object("about_dialog") + about.run() + about.destroy() +-- +2.47.3 + diff -Nru pyqso-1.1.0/debian/patches/series pyqso-1.1.0/debian/patches/series --- pyqso-1.1.0/debian/patches/series 2025-09-29 20:21:18.000000000 +0300 +++ pyqso-1.1.0/debian/patches/series 2026-03-03 20:04:10.000000000 +0200 @@ -5,3 +5,4 @@ 0002-Fix-missing-regex-raw-string.patch 0003-Fix-NavigationToolbar2GTK3-TypeError.patch 0004-Fix-missing-invalid-dependencies.patch +0001-Replace-deprecated-use-of-pkg_resources-with-calls-t.patch
