Merge branch 'f13' into f14

system-config-printer-device-id-msg.patch

@@ -0,0 +1,21 @@
+diff -up system-config-printer-1.2.4/cupshelpers/ppds.py.device-id-msg system-config-printer-1.2.4/cupshelpers/ppds.py
+--- system-config-printer-1.2.4/cupshelpers/ppds.py.device-id-msg	2010-07-30 15:35:01.000000000 +0100
++++ system-config-printer-1.2.4/cupshelpers/ppds.py	2010-10-01 11:37:06.683999393 +0100
+@@ -555,6 +555,8 @@ class PPDs:
+ 	@returns: an integer,string pair of (status,ppd-name)
+ 	"""
+         _debugprint ("\n%s %s" % (mfg, mdl))
++        orig_mfg = mfg
++        orig_mdl = mdl
+         self._init_ids ()
+ 
+         # Start with an empty result list and build it up using
+@@ -710,7 +712,7 @@ class PPDs:
+                 cmd = reduce (lambda x, y: x + ","+ y, commandsets)
+             except TypeError:
+                 cmd = ""
+-            id = "MFG:%s;MDL:%s;" % (mfg, mdl)
++            id = "MFG:%s;MDL:%s;" % (orig_mfg, orig_mdl)
+             if cmd:
+                 id += "CMD:%s;" % cmd
+             if description:

system-config-printer.spec

@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 # Python bindings for libsmbclient
 Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-translations.patch
+Patch2: system-config-printer-device-id-msg.patch
 Patch101: pysmbc-doczip.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -76,8 +77,12 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 
+# Updated translations.
 %patch1 -p1 -b .translations
 
+# Use actual device ID in debug output (bug #630350).
+%patch2 -p1 -b .device-id-msg
+
 pushd pysmbc-%{pysmbc_version}
 %patch101 -p1 -b .doczip
 popd
@@ -201,6 +206,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Oct  1 2010 Tim Waugh <twaugh@redhat.com> - 1.2.4-3
+- Use actual device ID in debug output (bug #630350).
+
 * Mon Sep 13 2010 Tim Waugh <twaugh@redhat.com> - 1.2.4-2
 - Rebuilt with updated translations.