r48983 - in /attic/system-config-printer/debian: changelog control control.in patches/0002-Disable-firewall-checks.patch patches/0008-fix-device-sorting.patch patches/0009-fix-udev-add-printer-shbang.patch patches/series
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Thu Jun 2 09:17:22 UTC 2016
Author: bigon
Date: Thu Jun 2 09:17:21 2016
New Revision: 48983
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48983
Log:
* Add debian/patches/0008-fix-device-sorting.patch: Fix sorting of devices,
taken from upstream
* Drop debian/patches/0002-Disable-firewall-checks.patch: firewalld is
available in Debian as well, let's integrate with it.
* Add debian/patches/0009-fix-udev-add-printer-shbang.patch: Fix incorrect
python3 invocation, taken from upstream
Added:
attic/system-config-printer/debian/patches/0008-fix-device-sorting.patch
attic/system-config-printer/debian/patches/0009-fix-udev-add-printer-shbang.patch
Removed:
attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch
Modified:
attic/system-config-printer/debian/changelog
attic/system-config-printer/debian/control
attic/system-config-printer/debian/control.in
attic/system-config-printer/debian/patches/series
Modified: attic/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/changelog?rev=48983&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog [utf-8] (original)
+++ attic/system-config-printer/debian/changelog [utf-8] Thu Jun 2 09:17:21 2016
@@ -8,8 +8,14 @@
* Drop debian/gpk-install-package-name, this doesn't seem needed anymore
* Drop adwaita-icon-theme dependency, try to avoid individual packages to
depends against themes.
-
- -- Laurent Bigonville <bigon at debian.org> Thu, 02 Jun 2016 10:31:17 +0200
+ * Add debian/patches/0008-fix-device-sorting.patch: Fix sorting of devices,
+ taken from upstream
+ * Drop debian/patches/0002-Disable-firewall-checks.patch: firewalld is
+ available in Debian as well, let's integrate with it.
+ * Add debian/patches/0009-fix-udev-add-printer-shbang.patch: Fix incorrect
+ python3 invocation, taken from upstream
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 02 Jun 2016 11:16:46 +0200
system-config-printer (1.5.7-1) unstable; urgency=medium
Modified: attic/system-config-printer/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control?rev=48983&op=diff
==============================================================================
--- attic/system-config-printer/debian/control [utf-8] (original)
+++ attic/system-config-printer/debian/control [utf-8] Thu Jun 2 09:17:21 2016
@@ -75,7 +75,7 @@
Suggests: gnome-software (>= 3.16.5-2)
Breaks: system-config-printer (<< 1.5.7-2~)
Replaces: system-config-printer (<< 1.5.7-2~)
-Description: graphical interface to configure the printing system
+Description: backend and the translation files for system-config-printer
System-config-printer is a GUI written in Python using GTK+ to
configure a CUPS server. Its primary use is to configure the printing
system on the local host, but can also be used to setup a remote
@@ -83,6 +83,9 @@
.
In terms of features, it aims to be as complete as the CUPS web
administration tool, while being integrated to the desktop.
+ .
+ This package contains the backend and the translation files for
+ system-config-printer
Package: python3-cupshelpers
Architecture: all
Modified: attic/system-config-printer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control.in?rev=48983&op=diff
==============================================================================
--- attic/system-config-printer/debian/control.in [utf-8] (original)
+++ attic/system-config-printer/debian/control.in [utf-8] Thu Jun 2 09:17:21 2016
@@ -71,7 +71,7 @@
Suggests: gnome-software (>= 3.16.5-2)
Breaks: system-config-printer (<< 1.5.7-2~)
Replaces: system-config-printer (<< 1.5.7-2~)
-Description: graphical interface to configure the printing system
+Description: backend and the translation files for system-config-printer
System-config-printer is a GUI written in Python using GTK+ to
configure a CUPS server. Its primary use is to configure the printing
system on the local host, but can also be used to setup a remote
@@ -79,6 +79,9 @@
.
In terms of features, it aims to be as complete as the CUPS web
administration tool, while being integrated to the desktop.
+ .
+ This package contains the backend and the translation files for
+ system-config-printer
Package: python3-cupshelpers
Architecture: all
Added: attic/system-config-printer/debian/patches/0008-fix-device-sorting.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0008-fix-device-sorting.patch?rev=48983&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0008-fix-device-sorting.patch (added)
+++ attic/system-config-printer/debian/patches/0008-fix-device-sorting.patch [utf-8] Thu Jun 2 09:17:21 2016
@@ -0,0 +1,138 @@
+From 43747c3b6d097663a40bf0e3e5ab30f0518312cc Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh at redhat.com>
+Date: Tue, 26 May 2015 09:56:34 +0100
+Subject: [PATCH] Fixed Device sorting (bug #1210733).
+
+---
+ cupshelpers/cupshelpers.py | 58 +++++++++++++++++++++++-----------------------
+ test_PhysicalDevice.py | 18 ++++++++++++++
+ 2 files changed, 47 insertions(+), 29 deletions(-)
+
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index 5067b76..3c502eb 100755
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
+@@ -547,68 +547,68 @@ def __lt__(self, other):
+ Compare devices by order of preference.
+ """
+ if other == None:
+- return 1
++ return True
+
+ if self.is_class != other.is_class:
+ if other.is_class:
+- return 1
+- return -1
++ return True
++ return False
+ if not self.is_class and (self.type != other.type):
+ # "hp"/"hpfax" before "usb" before * before "parallel" before
+ # "serial"
+ if other.type == "serial":
+- return 1
++ return True
+ if self.type == "serial":
+- return -1
++ return False
+ if other.type == "parallel":
+- return 1
++ return True
+ if self.type == "parallel":
+- return -1
++ return False
+ if other.type == "hp":
+- return -1
++ return False
+ if self.type == "hp":
+- return 1
++ return True
+ if other.type == "hpfax":
+- return -1
++ return False
+ if self.type == "hpfax":
+- return 1
++ return True
+ if other.type == "dnssd":
+- return -1
++ return False
+ if self.type == "dnssd":
+- return 1
++ return True
+ if other.type == "socket":
+- return -1
++ return False
+ if self.type == "socket":
+- return 1
++ return True
+ if other.type == "lpd":
+- return -1
++ return False
+ if self.type == "lpd":
+- return 1
++ return True
+ if other.type == "ipps":
+- return -1
++ return False
+ if self.type == "ipps":
+- return 1
++ return True
+ if other.type == "ipp":
+- return -1
++ return False
+ if self.type == "ipp":
+- return 1
++ return True
+ if other.type == "usb":
+- return -1
++ return False
+ if self.type == "usb":
+- return 1
++ return True
+ if self.type == "dnssd" and other.type == "dnssd":
+ if other.uri.find("._pdl-datastream") != -1: # Socket
+- return -1
++ return False
+ if self.uri.find("._pdl-datastream") != -1:
+- return 1
++ return True
+ if other.uri.find("._printer") != -1: # LPD
+- return -1
++ return False
+ if self.uri.find("._printer") != -1:
+- return 1
++ return True
+ if other.uri.find("._ipp") != -1: # IPP
+- return -1
++ return False
+ if self.uri.find("._ipp") != -1:
+- return 1
++ return True
+ result = bool(self.id) < bool(other.id)
+ if not result:
+ result = self.info < other.info
+diff --git a/test_PhysicalDevice.py b/test_PhysicalDevice.py
+index 2d452d6..1af90d9 100644
+--- a/test_PhysicalDevice.py
++++ b/test_PhysicalDevice.py
+@@ -55,3 +55,21 @@ def test_ordering():
+ phys.add_device (device)
+ devices = phys.get_devices ()
+ assert devices[0].uri.startswith ("hp")
++
++ dev1 = cupshelpers.Device("hp:/usb/HP_Color_LaserJet_CP3525?serial=CNCTC8G0QX",
++ **{'device-id':'MFG:Hewlett-Packard;CMD:PJL,MLC,BIDI-ECP,PJL,PCLXL,PCL,POSTSCRIPT,PDF;MDL:HP Color LaserJet CP3525;CLS:PRINTER;DES:Hewlett-Packard Color LaserJet CP3525;',
++ 'device-make-and-model':'HP Color LaserJet CP3525',
++ 'device-class':'direct'})
++ phys = PhysicalDevice (dev1)
++ dev2 = cupshelpers.Device('usb://HP/Color%20LaserJet%20CP3525?serial=CNCTC8G0QX',
++ **{'device-id':'MFG:Hewlett-Packard;CMD:PJL,MLC,BIDI-ECP,PJL,PCLXL,PCL,POSTSCRIPT,PDF;MDL:HP Color LaserJet CP3525;CLS:PRINTER;DES:Hewlett-Packard Color LaserJet CP3525;',
++ 'device-make-and-model':'HP Color LaserJet CP3525',
++ 'device-class':'direct'})
++
++ # hp device should sort < usb device
++ assert dev1 < dev2
++
++ phys.add_device (dev2)
++ devices = phys.get_devices ()
++ assert devices[0] < devices[1]
++ assert devices[0].uri.startswith ("hp")
Added: attic/system-config-printer/debian/patches/0009-fix-udev-add-printer-shbang.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0009-fix-udev-add-printer-shbang.patch?rev=48983&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0009-fix-udev-add-printer-shbang.patch (added)
+++ attic/system-config-printer/debian/patches/0009-fix-udev-add-printer-shbang.patch [utf-8] Thu Jun 2 09:17:21 2016
@@ -0,0 +1,19 @@
+From 68f059e44942467ddeee4977d10f2b3a961c9f3a Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh at redhat.com>
+Date: Tue, 12 May 2015 09:56:27 +0100
+Subject: [PATCH] Fixed shbang line in udev/udev-add-printer (trac #244).
+
+---
+ udev/udev-add-printer | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/udev/udev-add-printer b/udev/udev-add-printer
+index 3622d61..fec3c42 100755
+--- a/udev/udev-add-printer
++++ b/udev/udev-add-printer
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3 -s -B
++#!/usr/bin/python3 -sB
+
+ ## udev-add-printer
+
Modified: attic/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/series?rev=48983&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series [utf-8] (original)
+++ attic/system-config-printer/debian/patches/series [utf-8] Thu Jun 2 09:17:21 2016
@@ -1,4 +1,5 @@
03_install_layout.patch
-0002-Disable-firewall-checks.patch
0006-use-paper-size-default-in-etc-papersize.patch
0007-fix-pk-package-name.patch
+0008-fix-device-sorting.patch
+0009-fix-udev-add-printer-shbang.patch
More information about the pkg-gnome-commits
mailing list