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

[Modestas Vainius]

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

    Backport a bunch of PyQt 4.7 compatibility fixes from upstream VCS.
    
    Patch 04_system_config_printer_kde_pyqt4.7_issues.diff.
---
 debian/changelog                                   |    2 +
 ...4_system_config_printer_kde_pyqt4.7_issues.diff |   62 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24cbd1a..3e37f98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ 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)
+  * Backport a bunch of PyQt 4.7 compatibility fixes from upstream VCS
+    (patch 04_system_config_printer_kde_pyqt4.7_issues.diff).
 
  -- Modestas Vainius <modax at debian.org>  Thu, 16 Sep 2010 19:07:08 +0300
 
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
new file mode 100644
index 0000000..3e47f0d
--- /dev/null
+++ b/debian/patches/04_system_config_printer_kde_pyqt4.7_issues.diff
@@ -0,0 +1,62 @@
+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 16fad62..bce7fd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +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

-- 
KDE Admin module packaging