[SCM] KDE Admin module packaging branch, kde4.5, updated. debian/4.4.5-4-11-g71b7ee6

[Modestas Vainius]

The following commit has been merged in the kde4.5 branch:
commit a556dfc84f3ed7d53fb1c2494435f21875473080
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Sep 17 19:47:20 2010 +0300

    Drop 04_system_config_printer_kde_pyqt4.7_issues.diff patch.
    
    It was backported from upstream.
---
 debian/changelog                                   |    4 +
 ...4_system_config_printer_kde_pyqt4.7_issues.diff |   62 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36742f1..219d71a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ kdeadmin (4:4.5.1-0r1) UNRELEASED; urgency=low
   * Bump to Standards-Version 3.9.1:
     - kde-config-cron breaks kcron (<< 4:4.4) rather than conflicts.
 
+  [ Modestas Vainius ]
+  * Drop 04_system_config_printer_kde_pyqt4.7_issues.diff patch, it was
+    backported from upstream.
+
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sat, 11 Sep 2010 20:07:52 +0000
 
 kdeadmin (4:4.4.5-4) unstable; urgency=low
diff --git a/debian/patches/04_system_config_printer_kde_pyqt4.7_issues.diff b/debian/patches/04_system_config_printer_kde_pyqt4.7_issues.diff
deleted file mode 100644
index 3e47f0d..0000000
--- a/debian/patches/04_system_config_printer_kde_pyqt4.7_issues.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-Subject: Fix issues with PyQt 4.7
-Origin: backport, http://websvn.kde.org/?view=revision&revision=1099874
-                  http://websvn.kde.org/?view=revision&revision=1156006
-                  http://websvn.kde.org/?view=revision&revision=1167347
-                  http://websvn.kde.org/?view=revision&revision=1170241
-Applied-Upstream: 4.5.2
-
-A bunch of PyQt 4.7 compatibility fixes from upstream. Squeeze will be released
-with PyQt 4.7.3.
-
---- a/system-config-printer-kde/options.py
-+++ b/system-config-printer-kde/options.py
-@@ -133,7 +133,7 @@ class OptionAlwaysShown(OptionInterface)
-                 self.widget.clear()
-                 if type(supported) == list:
-                     for each in supported:
--                        self.widget.addItem(each)
-+                        self.widget.addItem(unicode(each))
-                 else:
-                     self.widget.addItem(supported)
-             elif (type(self.widget) == QComboBox and
-@@ -142,9 +142,9 @@ class OptionAlwaysShown(OptionInterface)
-                 self.widget.clear()
-                 if type(supported) == list:
-                     for each in supported:
--                        self.widget.addItem(self.combobox_dict[each])
-+                        self.widget.addItem(unicode(each))
-                 else:
--                    self.widget.addItem(self.combobox_dict[supported])
-+                    self.widget.addItem(supported)
-         if original_value != None:
-             self.original_value = self.ipp_type (original_value)
-             self.set_widget_value (self.original_value)
-@@ -318,7 +318,7 @@ class OptionSelectOne(Option):
-     def __init__(self, name, value, supported, on_change):
-         Option.__init__(self, name, value, supported, on_change)
- 
--        self.selector = QComboBox(self)
-+        self.selector = QComboBox()
- 
-         selected = None
-         for nr, choice in enumerate(supported):
---- a/system-config-printer-kde/system-config-printer-kde.py
-+++ b/system-config-printer-kde/system-config-printer-kde.py
-@@ -95,7 +95,7 @@ class PyKcm(KCModule):
-     def __init__(self, component_data, parent, gui):
-         KCModule.__init__(self, component_data, parent)
- 
--        uic.loadUi(APPDIR + "/" + "system-config-printer.ui", self)
-+        uic.loadUi(unicode(APPDIR + "/" + "system-config-printer.ui"), self)
-         self.setButtons(KCModule.Apply)
-         self.gui = gui
-         
-@@ -2036,7 +2036,7 @@ class NewPrinterGUI(QDialog):
-         self.WaitWindow = QMessageBox(self.mainapp)
-         self.WaitWindow.setStandardButtons(QMessageBox.NoButton)
- 
--        uic.loadUi(APPDIR + "/" + "new-printer.ui", self)
-+        uic.loadUi(unicode(APPDIR + "/" + "new-printer.ui"), self)
- 
-         self.btnNPBack.setIcon(KIcon("go-previous"))
-         self.btnNPForward.setIcon(KIcon("go-next"))
diff --git a/debian/patches/series b/debian/patches/series
index 578b234..578b501 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 01_system_config_printer_kde_cupsutils.diff
 02_kuser_first_uid_gid_fix.diff
 03_system_config_printer_kde_issues.diff
-04_system_config_printer_kde_pyqt4.7_issues.diff
 05_system_config_printer_kde_scroll_printer_options.diff

-- 
KDE Admin module packaging