r17395 - in /packages/unstable/hal-cups-utils/debian: changelog control.in patches/04_dont_disable_hp.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Nov  7 10:55:30 2008
New Revision: 17395

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17395
Log:
* 04_dont_disable_hp.patch: new patch. Do not disable at all HPLIP 
  printers. Closes: #504278.
* Add missing dependency on usbutils.

Added:
    packages/unstable/hal-cups-utils/debian/patches/04_dont_disable_hp.patch
Modified:
    packages/unstable/hal-cups-utils/debian/changelog
    packages/unstable/hal-cups-utils/debian/control.in
    packages/unstable/hal-cups-utils/debian/patches/series

Modified: packages/unstable/hal-cups-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hal-cups-utils/debian/changelog?rev=17395&op=diff
==============================================================================
--- packages/unstable/hal-cups-utils/debian/changelog (original)
+++ packages/unstable/hal-cups-utils/debian/changelog Fri Nov  7 10:55:30 2008
@@ -1,3 +1,11 @@
+hal-cups-utils (0.6.16-3) unstable; urgency=low
+
+  * 04_dont_disable_hp.patch: new patch. Do not disable at all HPLIP 
+    printers. Closes: #504278.
+  * Add missing dependency on usbutils.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 07 Nov 2008 11:52:51 +0100
+
 hal-cups-utils (0.6.16-2) unstable; urgency=low
 
   * Only suggest system-config-printer.

Modified: packages/unstable/hal-cups-utils/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hal-cups-utils/debian/control.in?rev=17395&op=diff
==============================================================================
--- packages/unstable/hal-cups-utils/debian/control.in (original)
+++ packages/unstable/hal-cups-utils/debian/control.in Fri Nov  7 10:55:30 2008
@@ -23,7 +23,8 @@
          python-dbus,
          python-gobject,
          hal,
-         cups
+         cups,
+         usbutils
 Suggests: hplip, system-config-printer
 Description: Utilities to detect and configure printers automatically
  These utilities allow to detect automatically printers using the HAL

Added: packages/unstable/hal-cups-utils/debian/patches/04_dont_disable_hp.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hal-cups-utils/debian/patches/04_dont_disable_hp.patch?rev=17395&op=file
==============================================================================
--- packages/unstable/hal-cups-utils/debian/patches/04_dont_disable_hp.patch (added)
+++ packages/unstable/hal-cups-utils/debian/patches/04_dont_disable_hp.patch Fri Nov  7 10:55:30 2008
@@ -1,0 +1,19 @@
+Index: hal-cups-utils-0.6.16/systemv/hal_lpadmin
+===================================================================
+--- hal-cups-utils-0.6.16.orig/systemv/hal_lpadmin	2008-11-07 11:50:31.699842788 +0100
++++ hal-cups-utils-0.6.16/systemv/hal_lpadmin	2008-11-07 11:52:38.839841866 +0100
+@@ -385,12 +385,8 @@ class HalPrinter:
+                 syslog (LOG_DEBUG,
+                          "Found configured printer: %s" % name)
+                 if printer.enabled:
+-                    if ((not printer.device_uri.startswith ("hp:") and
+-                         not printer.device_uri.startswith ("hpfax:")) or
+-                        (bus == "usb" and
+-                         printer.device_uri.find ("/usb/") != -1 and
+-                         not get_hplip_uris_for_usb (False, printer.device_uri) and
+-                         not get_hplip_uris_for_usb (True, printer.device_uri))):
++                    if (not printer.device_uri.startswith ("hp:") and
++                        not printer.device_uri.startswith ("hpfax:")):
+                         self.cups_connection.disablePrinter(name,
+                                                         "Unplugged or turned off")
+                         syslog (LOG_INFO,

Modified: packages/unstable/hal-cups-utils/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hal-cups-utils/debian/patches/series?rev=17395&op=diff
==============================================================================
--- packages/unstable/hal-cups-utils/debian/patches/series (original)
+++ packages/unstable/hal-cups-utils/debian/patches/series Fri Nov  7 10:55:30 2008
@@ -1,3 +1,4 @@
 01_python_interpreter.patch
 02_python_path.patch
 03_hal_fd.patch
+04_dont_disable_hp.patch