rev 14941 - in trunk/packages/kdeadmin/debian: . patches

[Didier Raboud]

Author: odyx-guest
Date: 2009-06-20 17:43:34 +0000 (Sat, 20 Jun 2009)
New Revision: 14941

Added:
   trunk/packages/kdeadmin/debian/patches/04_system_config_printer_kde_fix_split.diff
Modified:
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/control
   trunk/packages/kdeadmin/debian/patches/series
Log:
kdeadmin/system-config-printer-kde Fix "gnome/gtk/glade dependencies" in
 system-config-printer-kde by including Josselin Mouette's patch to cope with
 system-config-printer split. (Closes: #525558)



Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2009-06-19 23:08:35 UTC (rev 14940)
+++ trunk/packages/kdeadmin/debian/changelog	2009-06-20 17:43:34 UTC (rev 14941)
@@ -1,3 +1,11 @@
+kdeadmin (4:4.2.4-2) UNRELEASED; urgency=low
+
+  * Fix "gnome/gtk/glade dependencies" in system-config-printer-kde by
+    including Josselin Mouette's patch to cope with system-config-printer
+    split. (Closes: #525558)
+
+ -- Didier Raboud <didier at raboud.com>  Sat, 20 Jun 2009 18:01:35 +0200
+
 kdeadmin (4:4.2.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdeadmin/debian/control
===================================================================
--- trunk/packages/kdeadmin/debian/control	2009-06-19 23:08:35 UTC (rev 14940)
+++ trunk/packages/kdeadmin/debian/control	2009-06-20 17:43:34 UTC (rev 14941)
@@ -90,7 +90,7 @@
 Section: admin
 Architecture: all
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-qt4-dbus,
- python-kde4 (>= 4:4.2.0), system-config-printer (>= 1.0.0)
+ python-kde4 (>= 4:4.2.0), python-cupsutils (>= 1.0.0-6)
 Description: KDE 4 printer configuration utility
  This package contains a KDE4 based application which can be used to configure
  and manage printers.

Added: trunk/packages/kdeadmin/debian/patches/04_system_config_printer_kde_fix_split.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/04_system_config_printer_kde_fix_split.diff	                        (rev 0)
+++ trunk/packages/kdeadmin/debian/patches/04_system_config_printer_kde_fix_split.diff	2009-06-20 17:43:34 UTC (rev 14941)
@@ -0,0 +1,58 @@
+Description: Cope with system-config-printer split (now depends only on python-cupsutils)
+Origin: vendor: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525558#21
+Bug-Debian: http://bugs.debian.org/525558
+
+
+Index: kdeadmin-4.2.4/system-config-printer-kde/system-config-printer-kde.py
+===================================================================
+--- kdeadmin-4.2.4.orig/system-config-printer-kde/system-config-printer-kde.py	2009-06-20 18:55:51.000000000 +0200
++++ kdeadmin-4.2.4/system-config-printer-kde/system-config-printer-kde.py	2009-06-20 18:56:19.000000000 +0200
+@@ -32,11 +32,6 @@
+ #tempfile
+ import thread
+ 
+-#load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
+-SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
+-if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/config.py"):
+-    sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
+-
+ from PyQt4.QtCore import *
+ from PyQt4.QtGui import *
+ from PyQt4 import uic
+@@ -64,10 +59,12 @@
+ cups.require ("1.9.27")
+ 
+ # These come from system-config-printer
+-import config
+ import cupsutils.ppds
+-from cupsutils import cupshelpers  #, options
+-from smburi import SMBURI
++try:
++    import cupshelpers
++except ImportError:
++    from cupsutils import cupshelpers
++from cupsutils.smburi import SMBURI
+ from cupsutils.debug import *
+ 
+ import dbus
+@@ -706,8 +703,6 @@
+             # otherwise use cups' default one
+             custom_testpage = None
+             opt = self.ppd.findOption ("PageSize")
+-            if opt:
+-                custom_testpage = os.path.join(SYSTEM_CONFIG_PRINTER_DIR, 'testpage-%s.ps' % opt.defchoice.lower())
+ 
+             if custom_testpage and os.path.exists(custom_testpage):
+                 debugprint ('Printing custom test page ' + custom_testpage)
+@@ -1481,9 +1476,8 @@
+         """
+ 
+         # Optionally disable downloadable driver support.
+-        if not config.DOWNLOADABLE_DRIVER_SUPPORT:
+-            self.rbtnNPDownloadableDriverSearch.setEnabled(False)
+-            self.downloadableDriverSearchFrame.hide()
++        self.rbtnNPDownloadableDriverSearch.setEnabled(False)
++        self.downloadableDriverSearchFrame.hide()
+ 
+         """
+         # Set up OpenPrinting widgets.

Modified: trunk/packages/kdeadmin/debian/patches/series
===================================================================
--- trunk/packages/kdeadmin/debian/patches/series	2009-06-19 23:08:35 UTC (rev 14940)
+++ trunk/packages/kdeadmin/debian/patches/series	2009-06-20 17:43:34 UTC (rev 14941)
@@ -1,3 +1,4 @@
 01_system_config_printer_kde_cupsutils.diff
 02_kuser_first_uid_gid_fix.diff
 03_set_knetworkconf_backends_scriptsdir.diff
+04_system_config_printer_kde_fix_split.diff