diff -pruN 1.5.18-1/debian/changelog 1.5.18-1ubuntu1/debian/changelog --- 1.5.18-1/debian/changelog 2022-12-12 21:04:11.000000000 +0000 +++ 1.5.18-1ubuntu1/debian/changelog 2022-12-13 13:11:26.000000000 +0000 @@ -1,3 +1,12 @@ +system-config-printer (1.5.18-1ubuntu1) lunar; urgency=medium + + * Sync with Debian. Remaining changes: + - Add Rename-app-to-Printers.patch + - Add Hide-Printers-app-in-GNOME-and-KDE.patch + - Add Allow-installing-non-free-drivers-from-OpenPrinting.patch + + -- Jeremy Bicha Tue, 13 Dec 2022 08:11:26 -0500 + system-config-printer (1.5.18-1) unstable; urgency=medium [ Jeremy Bicha ] @@ -21,6 +30,24 @@ system-config-printer (1.5.18-1) unstabl -- Jeremy Bicha Mon, 12 Dec 2022 16:04:11 -0500 +system-config-printer (1.5.18-0ubuntu2) kinetic; urgency=medium + + * Needs "./configure ... --with-cups-serverbin-dir=/usr/lib/cups" in Kinetic + + -- Till Kamppeter Fri, 09 Sep 2022 13:32:22 +0200 + +system-config-printer (1.5.18-0ubuntu1) kinetic; urgency=medium + + * New upstream release bug fix release. + + -- Till Kamppeter Fri, 09 Sep 2022 12:25:22 +0200 + +system-config-printer (1.5.17-0ubuntu1) kinetic; urgency=medium + + * New upstream release. + + -- Till Kamppeter Wed, 24 Aug 2022 23:08:15 +0200 + system-config-printer (1.5.16-1) unstable; urgency=medium * New upstream release @@ -31,6 +58,43 @@ system-config-printer (1.5.16-1) unstabl -- Jeremy Bicha Mon, 21 Feb 2022 13:08:22 -0500 +system-config-printer (1.5.16-0ubuntu4) kinetic; urgency=medium + + * debian/rules: Refresh the .pot file when building (LP: #1971473) + + -- Gunnar Hjalmarsson Mon, 25 Jul 2022 23:59:43 +0200 + +system-config-printer (1.5.16-0ubuntu3) jammy; urgency=medium + + * Updated build-depends:, removing intltool and adding gettext and + autoconf-archive. + + -- Till Kamppeter Mon, 21 Feb 2022 15:01:23 +0100 + +system-config-printer (1.5.16-0ubuntu2) jammy; urgency=medium + + * Removed the explicit "Depends: python3-requests" (LP: #1959440). + + -- Till Kamppeter Sun, 20 Feb 2022 23:25:23 +0100 + +system-config-printer (1.5.16-0ubuntu1) jammy; urgency=medium + + * New upstream release + - One year of bug fixes and translations. + * Refreshed 0007-fix-pk-package-name.patch + * Updated Rename-app-to-Printers.patch + + -- Till Kamppeter Sun, 20 Feb 2022 22:32:23 +0100 + +system-config-printer (1.5.15-2ubuntu1) jammy; urgency=medium + + * Sync with Debian. Remaining changes: + - Add Rename-app-to-Printers.patch + - Add Hide-Printers-app-in-GNOME-and-KDE.patch + - Add Allow-installing-non-free-drivers-from-OpenPrinting.patch + + -- Jeremy Bicha Thu, 17 Feb 2022 12:41:04 -0500 + system-config-printer (1.5.15-2) unstable; urgency=medium * Add patch to support GNOME 42 dark theme preference @@ -38,6 +102,15 @@ system-config-printer (1.5.15-2) unstabl -- Jeremy Bicha Thu, 17 Feb 2022 12:37:20 -0500 +system-config-printer (1.5.15-1ubuntu1) jammy; urgency=medium + + * Sync with Debian. Remaining changes: + - Add Rename-app-to-Printers.patch + - Add Hide-Printers-app-in-GNOME-and-KDE.patch + - Add Allow-installing-non-free-drivers-from-OpenPrinting.patch + + -- Jeremy Bicha Thu, 17 Feb 2022 11:12:00 -0500 + system-config-printer (1.5.15-1) unstable; urgency=medium * New upstream release diff -pruN 1.5.18-1/debian/control 1.5.18-1ubuntu1/debian/control --- 1.5.18-1/debian/control 2022-12-12 21:04:11.000000000 +0000 +++ 1.5.18-1ubuntu1/debian/control 2022-12-13 13:11:26.000000000 +0000 @@ -5,7 +5,8 @@ Source: system-config-printer Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Guido Günther , Dmitry Shachnev , Jeremy Bicha , Laurent Bigonville Build-Depends: debhelper-compat (= 13), autoconf-archive, @@ -20,8 +21,10 @@ Build-Depends: debhelper-compat (= 13), xmlto Standards-Version: 4.6.1 Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer -Vcs-Git: https://salsa.debian.org/gnome-team/system-config-printer.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/system-config-printer.git +Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/system-config-printer.git -b ubuntu/master Homepage: https://github.com/OpenPrinting/system-config-printer Package: system-config-printer diff -pruN 1.5.18-1/debian/control.in 1.5.18-1ubuntu1/debian/control.in --- 1.5.18-1/debian/control.in 2022-12-12 21:04:11.000000000 +0000 +++ 1.5.18-1ubuntu1/debian/control.in 2022-12-13 13:11:26.000000000 +0000 @@ -1,7 +1,8 @@ Source: system-config-printer Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Guido Günther , @GNOME_TEAM@ Build-Depends: debhelper-compat (= 13), autoconf-archive, @@ -16,8 +17,10 @@ Build-Depends: debhelper-compat (= 13), xmlto Standards-Version: 4.6.1 Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer -Vcs-Git: https://salsa.debian.org/gnome-team/system-config-printer.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/system-config-printer.git +Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/system-config-printer.git -b ubuntu/master Homepage: https://github.com/OpenPrinting/system-config-printer Package: system-config-printer diff -pruN 1.5.18-1/debian/gbp.conf 1.5.18-1ubuntu1/debian/gbp.conf --- 1.5.18-1/debian/gbp.conf 2022-12-12 21:04:11.000000000 +0000 +++ 1.5.18-1ubuntu1/debian/gbp.conf 2022-12-13 13:11:26.000000000 +0000 @@ -1,6 +1,7 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/master +debian-tag=ubuntu/%(version)s upstream-branch = upstream/latest [buildpackage] diff -pruN 1.5.18-1/debian/patches/Allow-installing-non-free-drivers-from-OpenPrinting.patch 1.5.18-1ubuntu1/debian/patches/Allow-installing-non-free-drivers-from-OpenPrinting.patch --- 1.5.18-1/debian/patches/Allow-installing-non-free-drivers-from-OpenPrinting.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.5.18-1ubuntu1/debian/patches/Allow-installing-non-free-drivers-from-OpenPrinting.patch 2022-12-13 13:11:26.000000000 +0000 @@ -0,0 +1,20 @@ +From: Jeremy Bicha +Date: Thu, 17 Feb 2022 11:05:53 -0500 +Subject: Allow installing non-free drivers from OpenPrinting + +--- + config.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.py.in b/config.py.in +index 7ad67e1..da77c62 100644 +--- a/config.py.in ++++ b/config.py.in +@@ -25,6 +25,6 @@ pkgdatadir="@datadir@/@PACKAGE@" + VERSION="@VERSION@" + PACKAGE="@PACKAGE@" + DOWNLOADABLE_ONLYPPD=False +-DOWNLOADABLE_ONLYFREE=True ++DOWNLOADABLE_ONLYFREE=False + DOWNLOADABLE_PKG_ONLYSIGNED=True + packagesystem = None # discovered at runtime diff -pruN 1.5.18-1/debian/patches/Hide-Printers-app-in-GNOME-and-KDE.patch 1.5.18-1ubuntu1/debian/patches/Hide-Printers-app-in-GNOME-and-KDE.patch --- 1.5.18-1/debian/patches/Hide-Printers-app-in-GNOME-and-KDE.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.5.18-1ubuntu1/debian/patches/Hide-Printers-app-in-GNOME-and-KDE.patch 2022-12-13 13:11:26.000000000 +0000 @@ -0,0 +1,22 @@ +From: Jeremy Bicha +Date: Thu, 17 Feb 2022 11:03:46 -0500 +Subject: Hide Printers app in GNOME and KDE + +This is still accessible in GNOME from +Settings > Printers > Additional Printer Settings +--- + system-config-printer.desktop.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/system-config-printer.desktop.in b/system-config-printer.desktop.in +index 4f33582..1be241d 100644 +--- a/system-config-printer.desktop.in ++++ b/system-config-printer.desktop.in +@@ -8,6 +8,7 @@ Terminal=false + Type=Application + Icon=printer + StartupNotify=true ++NotShowIn=KDE;GNOME; + X-Ubuntu-Gettext-Domain=system-config-printer + Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-Unity-Settings-Panel; + X-GNOME-Settings-Panel=printing diff -pruN 1.5.18-1/debian/patches/Rename-app-to-Printers.patch 1.5.18-1ubuntu1/debian/patches/Rename-app-to-Printers.patch --- 1.5.18-1/debian/patches/Rename-app-to-Printers.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.5.18-1ubuntu1/debian/patches/Rename-app-to-Printers.patch 2022-12-13 13:11:26.000000000 +0000 @@ -0,0 +1,38 @@ +From: Jeremy Bicha +Date: Thu, 17 Feb 2022 11:01:53 -0500 +Subject: Rename app to Printers + +for better consistency with Unity +--- + system-config-printer.desktop.in | 6 +++--- + system-config-printer.py | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/system-config-printer.desktop.in b/system-config-printer.desktop.in +index 1be241d..1e91f39 100644 +--- a/system-config-printer.desktop.in ++++ b/system-config-printer.desktop.in +@@ -1,7 +1,7 @@ + [Desktop Entry] +-Name=Print Settings +-GenericName=Print Settings +-X-GNOME-FullName=Print Settings ++Name=Printers ++GenericName=Printers ++X-GNOME-FullName=Printers + Comment=Configure printers + Exec=system-config-printer + Terminal=false +diff --git a/system-config-printer.py b/system-config-printer.py +index c9689de..c18e251 100755 +--- a/system-config-printer.py ++++ b/system-config-printer.py +@@ -769,7 +769,7 @@ class GUI(GtkGUI): + connected = bool(self.cups) + + host = CUPS_server_hostname () +- self.PrintersWindow.set_title(_("Print Settings - %s") % host) ++ self.PrintersWindow.set_title(_("Printers - %s") % host) + + if connected: + status_msg = _("Connected to %s") % host diff -pruN 1.5.18-1/debian/patches/series 1.5.18-1ubuntu1/debian/patches/series --- 1.5.18-1/debian/patches/series 2022-12-12 21:04:11.000000000 +0000 +++ 1.5.18-1ubuntu1/debian/patches/series 2022-12-13 13:11:26.000000000 +0000 @@ -3,3 +3,6 @@ Allow-installing-packages-from-OpenPrinting.patch Do-not-autostart-the-applet-on-LXDE-or-Unity.patch Show-Printer-Settings-in-Unity-Control-Center.patch +Allow-installing-non-free-drivers-from-OpenPrinting.patch +Hide-Printers-app-in-GNOME-and-KDE.patch +Rename-app-to-Printers.patch