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

[Didier Raboud]

Author: odyx-guest
Date: 2009-08-09 10:02:52 +0000 (Sun, 09 Aug 2009)
New Revision: 15581

Modified:
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
Log:
kdeadmin: Update system-config-printer-kde patch. NEEDS TO BE TESTED.



Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2009-08-08 23:37:18 UTC (rev 15580)
+++ trunk/packages/kdeadmin/debian/changelog	2009-08-09 10:02:52 UTC (rev 15581)
@@ -1,6 +1,8 @@
 kdeadmin (4:4.3.0-2) UNRELEASED; urgency=low
 
   * Add watch file.
+  * Refresh 01_system_config_printer_kde_cupsutils.diff to correctly import 
+    options.py. THIS NEED TO BE TESTED !
 
  -- Didier Raboud <didier at raboud.com>  Sat, 08 Aug 2009 21:42:18 +0200
 

Modified: trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff	2009-08-08 23:37:18 UTC (rev 15580)
+++ trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff	2009-08-09 10:02:52 UTC (rev 15581)
@@ -1,10 +1,15 @@
 Description: Cope with system-config-printer split (now depends only on python-cupsutils)
+ Thanks to Josselin Mouette for the orginal patch.
 Origin: vendor: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525558#21
 Bug-Debian: http://bugs.debian.org/525558
+Author: Didier Raboud <didier at raboud.com>
+Last-Update: 2009-08-09
 
---- a/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
-+++ b/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
-@@ -8,7 +8,7 @@ SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/
+Index: kdeadmin-4.3.0/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
+===================================================================
+--- kdeadmin-4.3.0.orig/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py	2009-08-09 00:36:41.000000000 +0200
++++ kdeadmin-4.3.0/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py	2009-08-09 11:25:52.000000000 +0200
+@@ -8,7 +8,7 @@
  sys.path.append (SYSTEM_CONFIG_PRINTER_DIR)
  
  try:
@@ -13,9 +18,11 @@
  except:
      exit(1)
  print "Groovy"
---- a/system-config-printer-kde/system-config-printer-kde.py
-+++ b/system-config-printer-kde/system-config-printer-kde.py
-@@ -33,11 +33,6 @@ import locale
+Index: kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py
+===================================================================
+--- kdeadmin-4.3.0.orig/system-config-printer-kde/system-config-printer-kde.py	2009-08-09 00:36:41.000000000 +0200
++++ kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py	2009-08-09 12:00:54.000000000 +0200
+@@ -33,11 +33,6 @@
  
  import sys, os, time, traceback, re, tempfile, httplib, thread
  
@@ -27,17 +34,20 @@
  from PyQt4.QtCore import *
  from PyQt4.QtGui import *
  from PyQt4 import uic
-@@ -66,11 +61,14 @@ import cups
+@@ -65,12 +60,16 @@
+ import cups
  cups.require ("1.9.27")
  
- # These come from system-config-printer
+-# These come from system-config-printer
 -import config
 -import cupshelpers, options
++# These come from python-cupsutils
 +import cupsutils.ppds
 +try:
-+    import cupshelpers, options
++    import cupshelpers
 +except ImportError:
-+    from cupsutils import cupshelpers, options
++    from cupsutils import cupshelpers
++import options
  from optionwidgets import OptionWidget
 -from smburi import SMBURI
 -from debug import *
@@ -46,7 +56,7 @@
  
  import dbus
  import dbus.mainloop.qt
-@@ -898,10 +896,6 @@ class GUI(QWidget):
+@@ -898,10 +897,6 @@
              # otherwise use cups' default one
              custom_testpage = None
              opt = self.ppd.findOption ("PageSize")
@@ -57,20 +67,22 @@
  
              if custom_testpage and os.path.exists(custom_testpage):
                  debugprint ('Printing custom test page ' + custom_testpage)
-@@ -2084,10 +2078,8 @@ class NewPrinterGUI(QDialog):
+@@ -2083,11 +2078,9 @@
+         #self.connect(self.btnNCAddMember, SIGNAL("clicked()"), self.slot_btnNCAddMember_clicked)
          #self.connect(self.btnNCDelMember, SIGNAL("clicked()"), self.slot_btnNCDelMember_clicked)
  
-         # Optionally disable downloadable driver support.
+-        # Optionally disable downloadable driver support.
 -        #if not config.DOWNLOADABLE_DRIVER_SUPPORT:
 -        if True:
 -            self.rbtnNPDownloadableDriverSearch.setEnabled(False)
 -            self.downloadableDriverSearchFrame.hide()
++        # Disable downloadable driver support.
 +        self.rbtnNPDownloadableDriverSearch.setEnabled(False)
 +        self.downloadableDriverSearchFrame.hide()
  
          """
          # Set up OpenPrinting widgets.
-@@ -2297,7 +2289,7 @@ class NewPrinterGUI(QDialog):
+@@ -2297,7 +2290,7 @@
              c = cups.Connection ()
              debugprint ("Fetching PPDs")
              ppds_dict = c.getPPDs()
@@ -79,7 +91,7 @@
                                                       language=language)
              debugprint ("Closing connection (PPDs)")
              del c
-@@ -2523,7 +2515,7 @@ class NewPrinterGUI(QDialog):
+@@ -2523,7 +2516,7 @@
                          ppddict = self.ppds.getInfoFromPPDName (ppdname)
                          make_model = ppddict['ppd-make-and-model']
                          (make, model) = \
@@ -88,7 +100,7 @@
                          self.auto_make = make
                          self.auto_model = model
                  except:
-@@ -2892,7 +2884,7 @@ class NewPrinterGUI(QDialog):
+@@ -2892,7 +2885,7 @@
          if make_and_model and not device.id:
              mk = None
              md = None