[SCM] KDE Admin module packaging branch, master, updated. debian/4.4.5-1-8-gc2d3e24

[Sune Vuorela]

The following commit has been merged in the master branch:
commit c2d3e2445339097d9f343ac9356afa63da898207
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Mon Aug 30 02:09:55 2010 +0200

    fix up system-config-printer code
---
 debian/changelog                                   |    8 +++++++-
 .../03_system_config_printer_kde_issues.diff       |   11 +++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d257b5..464dfa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 kdeadmin (4:4.4.5-2) UNRELEASED; urgency=low
 
+  [ Modestas Vainius ]
   * Point debian/control Vcs fields to the new Git repository.
   * Modify changelog to reflect the actual history.
 
- -- Modestas Vainius <modax at debian.org>  Mon, 26 Jul 2010 23:24:32 +0300
+  [ Sune Vuorela ]
+  * Merge in Guido's NMU
+  * Fix the code regarding a message box in system-config-printer-kde 
+    (Closes: 593403)
+
+ -- Sune Vuorela <sune at debian.org>  Mon, 30 Aug 2010 02:08:09 +0200
 
 kdeadmin (4:4.4.5-1.1) experimental; urgency=low
 
diff --git a/debian/patches/03_system_config_printer_kde_issues.diff b/debian/patches/03_system_config_printer_kde_issues.diff
new file mode 100644
index 0000000..fa78008
--- /dev/null
+++ b/debian/patches/03_system_config_printer_kde_issues.diff
@@ -0,0 +1,11 @@
+--- a/system-config-printer-kde/system-config-printer-kde.py
++++ b/system-config-printer-kde/system-config-printer-kde.py
+@@ -1868,7 +1868,7 @@ class GUI(QWidget):
+             else:
+                 msg = i18nc("HTTP error", "status %1", status)
+ 
+-        KMessageBox.error(self, i18n("There was an HTTP error: %1.", msg), i18n('CUPS server error'))
++            KMessageBox.error(self, i18n("There was an HTTP error: %1.", msg), i18n('CUPS server error'))
+ 
+     def getSelectedItem(self):
+         return unicode(self.mainListSelectedName), unicode(self.mainListSelectedType)
diff --git a/debian/patches/series b/debian/patches/series
index 245d377..16fad62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_system_config_printer_kde_cupsutils.diff
 02_kuser_first_uid_gid_fix.diff
+03_system_config_printer_kde_issues.diff

-- 
KDE Admin module packaging