r16954 - in /packages/unstable/system-config-printer/debian: changelog patches/04_jobsheets_traceback.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Sep 12 15:51:04 2008
New Revision: 16954

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16954
Log:
04_jobsheets_traceback.patch: new patch. Don't send None to 
setPrinterJobSheets, it only accepts strings.
Closes: #486941, #486580.

Added:
    packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch
Modified:
    packages/unstable/system-config-printer/debian/changelog
    packages/unstable/system-config-printer/debian/patches/series

Modified: packages/unstable/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/changelog?rev=16954&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/changelog (original)
+++ packages/unstable/system-config-printer/debian/changelog Fri Sep 12 15:51:04 2008
@@ -1,10 +1,13 @@
-system-config-printer (1.0.0-3) UNRELEASED; urgency=low
+system-config-printer (1.0.0-3) unstable; urgency=low
 
   * 02_translations.patch:
     + Updated Catalan translation by David Planella. Closes: #494092.
     + Updated Finnish translation by Esko Arajärvi. Closes: #498106.
+  * 04_jobsheets_traceback.patch: new patch. Don't send None to 
+    setPrinterJobSheets, it only accepts strings.
+    Closes: #486941, #486580.
 
- -- Josselin Mouette <joss at debian.org>  Sat, 30 Aug 2008 00:06:36 +0200
+ -- Josselin Mouette <joss at debian.org>  Fri, 12 Sep 2008 17:50:55 +0200
 
 system-config-printer (1.0.0-2) unstable; urgency=low
 

Added: packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch?rev=16954&op=file
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch (added)
+++ packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch Fri Sep 12 15:51:04 2008
@@ -1,0 +1,13 @@
+Index: system-config-printer-1.0.0/cupshelpers.py
+===================================================================
+--- system-config-printer-1.0.0.orig/cupshelpers.py	2008-09-12 17:44:48.747750901 +0200
++++ system-config-printer-1.0.0/cupshelpers.py	2008-09-12 17:45:13.190750223 +0200
+@@ -208,6 +208,8 @@
+         self.connection.setPrinterOpPolicy(self.name, policy)    
+ 
+     def setJobSheets(self, start, end):
++        if start == None: start = ""
++        if end == None: end = ""
+         self.connection.setPrinterJobSheets(self.name, start, end)
+ 
+     def setAccess(self, allow, except_users):

Modified: packages/unstable/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/patches/series?rev=16954&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/series (original)
+++ packages/unstable/system-config-printer/debian/patches/series Fri Sep 12 15:51:04 2008
@@ -1,6 +1,7 @@
 01_no_rhpl.patch
 02_translations.patch
 03_elementtree.patch
+04_jobsheets_traceback.patch
 08_stock_icons.patch
 10_show_manage_jobs.patch
 11_use_gksu.patch