[SCM] KDE Admin module packaging branch, master, updated. debian/4.4.5-3-2-gdad7a87

[Modestas Vainius]

The following commit has been merged in the master branch:
commit dad7a87be1c4c34e8cbd53ea9e11d983e80e2a25
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Sep 16 19:09:53 2010 +0300

    Properly load cupshelpers module.
    
    The bug was in the 01_system_config_printer_kde_cupsutils.diff patch.
    Closes: #597071
---
 debian/changelog                                   |    2 +
 .../01_system_config_printer_kde_cupsutils.diff    |   22 ++++++-------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c39b593..24cbd1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kdeadmin (4:4.4.5-4) UNRELEASED; urgency=low
 
+  * Properly load cupshelpers module (i.e. fix
+    01_system_config_printer_kde_cupsutils.diff patch). (Closes: #597071)
 
  -- Modestas Vainius <modax at debian.org>  Thu, 16 Sep 2010 19:07:08 +0300
 
diff --git a/debian/patches/01_system_config_printer_kde_cupsutils.diff b/debian/patches/01_system_config_printer_kde_cupsutils.diff
index d27d5e0..76d6cee 100644
--- a/debian/patches/01_system_config_printer_kde_cupsutils.diff
+++ b/debian/patches/01_system_config_printer_kde_cupsutils.diff
@@ -2,15 +2,11 @@ Description: Cope with system-config-printer split (now depends only on python-c
  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
+Bug-Debian: http://bugs.debian.org/597071
 Author: Didier Raboud <didier at raboud.com>
-Last-Update: 2010-08-13
+Author: Modestas Vainius <modax at debian.org>
+Last-Update: 2010-09-16
 
----
- .../system-config-printer-kde.py                   |   28 ++++++-------------
- 1 files changed, 9 insertions(+), 19 deletions(-)
-
-diff --git a/system-config-printer-kde/system-config-printer-kde.py b/system-config-printer-kde/system-config-printer-kde.py
-index 650d665..02c71eb 100755
 --- 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
@@ -25,17 +21,14 @@ index 650d665..02c71eb 100755
  from PyQt4.QtCore import *
  from PyQt4.QtGui import *
  from PyQt4 import uic
-@@ -65,12 +60,13 @@ uic.properties.Properties._string = translate
+@@ -65,12 +60,11 @@ uic.properties.Properties._string = tran
  import cups
  cups.require ("1.9.27")
  
 -# These come from system-config-printer
 -import config
--import cupshelpers, options
 +# These come from python-cupsutils
-+import cupshelpers.ppds
-+from cupshelpers import cupshelpers
-+import options
+ import cupshelpers, options
  from optionwidgets import OptionWidget
 -from smburi import SMBURI
 -from debug import *
@@ -44,7 +37,7 @@ index 650d665..02c71eb 100755
  
  import dbus
  import dbus.mainloop.qt
-@@ -898,10 +894,6 @@ class GUI(QWidget):
+@@ -898,10 +892,6 @@ class GUI(QWidget):
              # otherwise use cups' default one
              custom_testpage = None
              opt = self.ppd.findOption ("PageSize")
@@ -55,7 +48,7 @@ index 650d665..02c71eb 100755
  
              if custom_testpage and os.path.exists(custom_testpage):
                  debugprint ('Printing custom test page ' + custom_testpage)
-@@ -2083,11 +2075,9 @@ class NewPrinterGUI(QDialog):
+@@ -2083,11 +2073,9 @@ class NewPrinterGUI(QDialog):
          #self.connect(self.btnNCAddMember, SIGNAL("clicked()"), self.slot_btnNCAddMember_clicked)
          #self.connect(self.btnNCDelMember, SIGNAL("clicked()"), self.slot_btnNCDelMember_clicked)
  
@@ -70,4 +63,3 @@ index 650d665..02c71eb 100755
  
          """
          # Set up OpenPrinting widgets.
---

-- 
KDE Admin module packaging