r17392 - in /packages/experimental/hal-cups-utils/debian: changelog control control.in copyright patches/01_python_interpreter.patch patches/02_python_path.patch patches/03_hal_fd.patch patches/03_subprocess_crash.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Nov 7 09:51:35 UTC 2008
Author: joss
Date: Fri Nov 7 09:51:35 2008
New Revision: 17392
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17392
Log:
* Add homepage field.
* Update copyright.
* Use gnome-get-source.mk.
* New upstream release.
+ Uses libusb to detect connectivity of printers connected with the
hplip backend. Closes: #504278.
+ Refresh 01_python_interpreter.patch.
+ Adapt 02_python_path.patch to the python-cupsutils scheme (waiting
for a migration to python-cupshelpers).
+ 03_hal_fd.patch: removed, fixed upstream.
* Standards version is 3.8.0.
* 03_subprocess_crash.patch: new patch. Fix crash caused by using
twice the same variable name.
Added:
packages/experimental/hal-cups-utils/debian/patches/03_subprocess_crash.patch
Removed:
packages/experimental/hal-cups-utils/debian/patches/03_hal_fd.patch
Modified:
packages/experimental/hal-cups-utils/debian/changelog
packages/experimental/hal-cups-utils/debian/control
packages/experimental/hal-cups-utils/debian/control.in
packages/experimental/hal-cups-utils/debian/copyright
packages/experimental/hal-cups-utils/debian/patches/01_python_interpreter.patch
packages/experimental/hal-cups-utils/debian/patches/02_python_path.patch
packages/experimental/hal-cups-utils/debian/patches/series
packages/experimental/hal-cups-utils/debian/rules
Modified: packages/experimental/hal-cups-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/hal-cups-utils/debian/changelog?rev=17392&op=diff
==============================================================================
--- packages/experimental/hal-cups-utils/debian/changelog (original)
+++ packages/experimental/hal-cups-utils/debian/changelog Fri Nov 7 09:51:35 2008
@@ -1,3 +1,21 @@
+hal-cups-utils (0.6.18-1) UNRELEASED; urgency=low
+
+ * Add homepage field.
+ * Update copyright.
+ * Use gnome-get-source.mk.
+ * New upstream release.
+ + Uses libusb to detect connectivity of printers connected with the
+ hplip backend. Closes: #504278.
+ + Refresh 01_python_interpreter.patch.
+ + Adapt 02_python_path.patch to the python-cupsutils scheme (waiting
+ for a migration to python-cupshelpers).
+ + 03_hal_fd.patch: removed, fixed upstream.
+ * Standards version is 3.8.0.
+ * 03_subprocess_crash.patch: new patch. Fix crash caused by using
+ twice the same variable name.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 07 Nov 2008 10:25:10 +0100
+
hal-cups-utils (0.6.16-2) unstable; urgency=low
* Only suggest system-config-printer.
Modified: packages/experimental/hal-cups-utils/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/hal-cups-utils/debian/control?rev=17392&op=diff
==============================================================================
--- packages/experimental/hal-cups-utils/debian/control (original)
+++ packages/experimental/hal-cups-utils/debian/control Fri Nov 7 09:51:35 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Build-Depends: debhelper (>= 5),
gnome-pkg-tools (>= 0.10),
cdbs (>= 0.4.41),
@@ -13,6 +13,7 @@
libdbus-glib-1-dev,
libglib2.0-dev (>= 2.4),
libcups2-dev
+Homepage: https://fedorahosted.org/hal-cups-utils/
Package: hal-cups-utils
Architecture: any
@@ -22,6 +23,7 @@
python-cupsutils,
python-dbus,
python-gobject,
+ python-usb,
hal,
cups
Suggests: hplip, system-config-printer
Modified: packages/experimental/hal-cups-utils/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/hal-cups-utils/debian/control.in?rev=17392&op=diff
==============================================================================
--- packages/experimental/hal-cups-utils/debian/control.in (original)
+++ packages/experimental/hal-cups-utils/debian/control.in Fri Nov 7 09:51:35 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Build-Depends: debhelper (>= 5),
gnome-pkg-tools (>= 0.10),
cdbs (>= 0.4.41),
@@ -13,6 +13,7 @@
libdbus-glib-1-dev,
libglib2.0-dev (>= 2.4),
libcups2-dev
+Homepage: https://fedorahosted.org/hal-cups-utils/
Package: hal-cups-utils
Architecture: any
@@ -22,6 +23,7 @@
python-cupsutils,
python-dbus,
python-gobject,
+ python-usb,
hal,
cups
Suggests: hplip, system-config-printer
Modified: packages/experimental/hal-cups-utils/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/hal-cups-utils/debian/copyright?rev=17392&op=diff
==============================================================================
--- packages/experimental/hal-cups-utils/debian/copyright (original)
+++ packages/experimental/hal-cups-utils/debian/copyright Fri Nov 7 09:51:35 2008
@@ -2,7 +2,7 @@
Sat, 14 Jun 2008 15:44:35 +0200.
It was downloaded from:
-http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/
+https://fedorahosted.org/hal-cups-utils/wiki/ProjectReleases
Upstream Authors:
John (J5) Palmieri <johnp at martianrock.com>
Modified: packages/experimental/hal-cups-utils/debian/patches/01_python_interpreter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/hal-cups-utils/debian/patches/01_python_interpreter.patch?rev=17392&op=diff
==============================================================================
--- packages/experimental/hal-cups-utils/debian/patches/01_python_interpreter.patch (original)
+++ packages/experimental/hal-cups-utils/debian/patches/01_python_interpreter.patch Fri Nov 7 09:51:35 2008
@@ -1,10 +1,10 @@
-Index: hal-cups-utils-0.6.16/systemv/hal_lpadmin
+Index: hal-cups-utils-0.6.18/systemv/hal_lpadmin
===================================================================
---- hal-cups-utils-0.6.16.orig/systemv/hal_lpadmin 2008-06-14 16:04:44.909969423 +0200
-+++ hal-cups-utils-0.6.16/systemv/hal_lpadmin 2008-06-14 16:04:52.993968716 +0200
+--- hal-cups-utils-0.6.18.orig/systemv/hal_lpadmin 2008-11-04 18:05:16.000000000 +0100
++++ hal-cups-utils-0.6.18/systemv/hal_lpadmin 2008-11-07 10:15:33.147337162 +0100
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/python
import dbus, sys, os, time, signal, re
import traceback
- sys.path.append("/usr/share/system-config-printer")
+ import cups, cupshelpers
Modified: packages/experimental/hal-cups-utils/debian/patches/02_python_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/hal-cups-utils/debian/patches/02_python_path.patch?rev=17392&op=diff
==============================================================================
--- packages/experimental/hal-cups-utils/debian/patches/02_python_path.patch (original)
+++ packages/experimental/hal-cups-utils/debian/patches/02_python_path.patch Fri Nov 7 09:51:35 2008
@@ -1,15 +1,41 @@
-Index: hal-cups-utils-0.6.16/systemv/hal_lpadmin
+Index: hal-cups-utils-0.6.18/systemv/hal_lpadmin
===================================================================
---- hal-cups-utils-0.6.16.orig/systemv/hal_lpadmin 2008-06-14 16:05:04.578475477 +0200
-+++ hal-cups-utils-0.6.16/systemv/hal_lpadmin 2008-06-14 16:05:33.920151514 +0200
-@@ -1,8 +1,8 @@
+--- hal-cups-utils-0.6.18.orig/systemv/hal_lpadmin 2008-11-07 10:15:33.147337162 +0100
++++ hal-cups-utils-0.6.18/systemv/hal_lpadmin 2008-11-07 10:19:27.411335799 +0100
+@@ -1,7 +1,8 @@
#!/usr/bin/python
import dbus, sys, os, time, signal, re
import traceback
--sys.path.append("/usr/share/system-config-printer")
--import cups, cupshelpers, ppds
+-import cups, cupshelpers
+import cups
+from cupsutils import cupshelpers, ppds
+ import subprocess
from syslog import *
+ try:
+@@ -522,7 +523,7 @@ class HalPrinter:
+ # really new printer - try autodetection
+ if p == None:
+ cupsppds = self.cups_connection.getPPDs ()
+- p = cupshelpers.ppds.PPDs (cupsppds)
++ p = ppds.PPDs (cupsppds)
+ syslog (LOG_DEBUG, "Device ID: MFG:%s;MDL:%s;DES:%s;CMD:%s; URI:%s" %
+ (self.make, self.model, self.description,
+ reduce(lambda x, y: x + ',' + y, self.commandsets),
+@@ -552,7 +553,7 @@ class HalPrinter:
+ faxname = self.faxname
+ if p == None:
+ cupsppds = self.cups_connection.getPPDs ()
+- p = cupshelpers.ppds.PPDs (cupsppds)
++ p = ppds.PPDs (cupsppds)
+ (status, faxppd) = p.getPPDNameFromDeviceID ("HP", "Fax",
+ "HP Fax", [], faxuri)
+ info = "Fax queue for %s %s" % (self.make, self.model)
+@@ -658,7 +659,7 @@ class HalPrinter:
+ if model[-1]=="\n": model = model[:-1]
- def get_hplip_uris_for_usb (fax=False, checkuri=None):
+ cupsppds = self.cups_connection.getPPDs ()
+- p = cupshelpers.ppds.PPDs (cupsppds)
++ p = ppds.PPDs (cupsppds)
+ (status, ppdname) = p.getPPDNameFromDeviceID (make, model, "", "")
+
+ if not ppdname:
Added: packages/experimental/hal-cups-utils/debian/patches/03_subprocess_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/hal-cups-utils/debian/patches/03_subprocess_crash.patch?rev=17392&op=file
==============================================================================
--- packages/experimental/hal-cups-utils/debian/patches/03_subprocess_crash.patch (added)
+++ packages/experimental/hal-cups-utils/debian/patches/03_subprocess_crash.patch Fri Nov 7 09:51:35 2008
@@ -1,0 +1,37 @@
+Index: hal-cups-utils-0.6.18/systemv/hal_lpadmin
+===================================================================
+--- hal-cups-utils-0.6.18.orig/systemv/hal_lpadmin 2008-11-07 10:37:19.647338978 +0100
++++ hal-cups-utils-0.6.18/systemv/hal_lpadmin 2008-11-07 10:38:59.219838556 +0100
+@@ -207,7 +207,7 @@ class HalPrinter:
+ if p.get (key) == None:
+ continue
+ try:
+- p = subprocess.Popen (["hal-set-property",
++ pr = subprocess.Popen (["hal-set-property",
+ "--udi=%s" % self.uid,
+ "--key=%s" % key,
+ "--string=%s" % p[key]],
+@@ -215,12 +215,12 @@ class HalPrinter:
+ stdin=devnull,
+ stdout=devnull,
+ stderr=subprocess.STDOUT)
+- p.wait ()
++ pr.wait ()
+ except:
+ pass
+ for cs in self.commandsets:
+ try:
+- p = subprocess.Popen (["hal-set-property",
++ pr = subprocess.Popen (["hal-set-property",
+ "--udi=%s" % self.uid,
+ "--key=printer.commandset",
+ "--strlist-post=%s" % cs],
+@@ -228,7 +228,7 @@ class HalPrinter:
+ stdin=devnull,
+ stdout=devnull,
+ stderr=subprocess.STDOUT)
+- p.wait ()
++ pr.wait ()
+ except:
+ pass
+ syslog (LOG_DEBUG, "Written device ID into HAL database entry")
Modified: packages/experimental/hal-cups-utils/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/hal-cups-utils/debian/patches/series?rev=17392&op=diff
==============================================================================
--- packages/experimental/hal-cups-utils/debian/patches/series (original)
+++ packages/experimental/hal-cups-utils/debian/patches/series Fri Nov 7 09:51:35 2008
@@ -1,3 +1,3 @@
01_python_interpreter.patch
02_python_path.patch
-03_hal_fd.patch
+03_subprocess_crash.patch
Modified: packages/experimental/hal-cups-utils/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/hal-cups-utils/debian/rules?rev=17392&op=diff
==============================================================================
--- packages/experimental/hal-cups-utils/debian/rules (original)
+++ packages/experimental/hal-cups-utils/debian/rules Fri Nov 7 09:51:35 2008
@@ -1,9 +1,12 @@
#!/usr/bin/make -f
+
+GNOME_DOWNLOAD_URL = https://fedorahosted.org/hal-cups-utils/attachment/wiki/ProjectReleases/$(GNOME_TARBALL)?format=raw
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=/usr/lib/hal
More information about the pkg-gnome-commits
mailing list