[SCM] KDE Admin module packaging branch, master, updated. debian/4.6.5-2-5-g2896792

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 98e2ec0272307bc1456e2201e95de9d1e1a82b3c
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sun Oct 2 15:45:43 2011 +0100

    Update patches/system_config_printer_kde_cupsutils.diff
---
 debian/changelog                                   |    1 +
 .../system_config_printer_kde_cupsutils.diff       |   17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fde7cd..d9f14d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kdeadmin (4:4.7.1-0r0) UNRELEASED; urgency=low
 
   [ Daniele E. Domenichelli ]
   * New upstream release.
+  * Update patches/system_config_printer_kde_cupsutils.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 02 Oct 2011 14:07:07 +0100
 
diff --git a/debian/patches/system_config_printer_kde_cupsutils.diff b/debian/patches/system_config_printer_kde_cupsutils.diff
index f5ce7b0..14c0d2f 100644
--- a/debian/patches/system_config_printer_kde_cupsutils.diff
+++ b/debian/patches/system_config_printer_kde_cupsutils.diff
@@ -5,13 +5,13 @@ Bug-Debian: http://bugs.debian.org/525558
 Bug-Debian: http://bugs.debian.org/597071
 Author: Didier Raboud <didier at raboud.com>
 Author: Modestas Vainius <modax at debian.org>
-Last-Update: 2010-04-02
+Last-Update: 2011-10-02
 
 --- 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 sys, os, time, traceback, re, tempfile, httplib, thread
+ import sys, os, time, traceback, re, tempfile, httplib, thread, string
  
 -#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"
@@ -21,9 +21,9 @@ Last-Update: 2010-04-02
  from PyQt4.QtCore import *
  from PyQt4.QtGui import *
  from PyQt4 import uic
-@@ -65,12 +60,11 @@
- import cups
- cups.require ("1.9.27")
+@@ -71,12 +66,12 @@
+ except:
+     PYSMB_AVAILABLE=False
  
 -# These come from system-config-printer
 -import config
@@ -34,10 +34,11 @@ Last-Update: 2010-04-02
 -from debug import *
 +from cupshelpers.smburi import SMBURI
 +from cupshelpers.debug import *
++
+ import authconn
  
  import dbus
- import dbus.mainloop.qt
-@@ -903,10 +897,6 @@
+@@ -975,10 +970,6 @@
              # otherwise use cups' default one
              custom_testpage = None
              opt = self.ppd.findOption ("PageSize")
@@ -48,7 +49,7 @@ Last-Update: 2010-04-02
  
              if custom_testpage and os.path.exists(custom_testpage):
                  debugprint ('Printing custom test page ' + custom_testpage)
-@@ -2090,11 +2080,9 @@
+@@ -2167,11 +2158,9 @@
          #self.connect(self.btnNCAddMember, SIGNAL("clicked()"), self.slot_btnNCAddMember_clicked)
          #self.connect(self.btnNCDelMember, SIGNAL("clicked()"), self.slot_btnNCDelMember_clicked)
  

-- 
KDE Admin module packaging