[SCM] KDE Admin module packaging branch, master, updated. debian/4.4.5-4-25-g21c196e

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Sun Mar 27 22:15:41 UTC 2011


The following commit has been merged in the master branch:
commit 2d2bd6744477eacb11f3c91386e92c6c2d9ba495
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Feb 4 04:14:02 2011 +0100

    Refresh patches, drop 03_system_config_printer_kde_issues.diff
---
 debian/changelog                                   |    1 +
 .../01_system_config_printer_kde_cupsutils.diff    |    8 ++++----
 .../03_system_config_printer_kde_issues.diff       |   11 -----------
 debian/patches/series                              |    1 -
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3abaf0..8e27c80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ kdeadmin (4:4.6.0-0r1) UNRELEASED; urgency=low
   * Update installed files.
   * Bump to Standards-Version 3.9.1:
     - kde-config-cron breaks kcron (<< 4:4.4) rather than conflicts.
+  * Drop 03_system_config_printer_kde_issues.diff, no longer needed.
 
   [ Modestas Vainius ]
   * Drop 04_system_config_printer_kde_pyqt4.7_issues.diff patch, it was
diff --git a/debian/patches/01_system_config_printer_kde_cupsutils.diff b/debian/patches/01_system_config_printer_kde_cupsutils.diff
index 60ca7af..4616fb3 100644
--- a/debian/patches/01_system_config_printer_kde_cupsutils.diff
+++ b/debian/patches/01_system_config_printer_kde_cupsutils.diff
@@ -9,7 +9,7 @@ Last-Update: 2010-09-16
 
 --- 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
+@@ -33,11 +33,6 @@
  
  import sys, os, time, traceback, re, tempfile, httplib, thread
  
@@ -21,7 +21,7 @@ Last-Update: 2010-09-16
  from PyQt4.QtCore import *
  from PyQt4.QtGui import *
  from PyQt4 import uic
-@@ -65,12 +60,11 @@ uic.properties.Properties._string = tran
+@@ -65,12 +60,11 @@
  import cups
  cups.require ("1.9.27")
  
@@ -37,7 +37,7 @@ Last-Update: 2010-09-16
  
  import dbus
  import dbus.mainloop.qt
-@@ -898,10 +892,6 @@ class GUI(QWidget):
+@@ -903,10 +897,6 @@
              # otherwise use cups' default one
              custom_testpage = None
              opt = self.ppd.findOption ("PageSize")
@@ -48,7 +48,7 @@ Last-Update: 2010-09-16
  
              if custom_testpage and os.path.exists(custom_testpage):
                  debugprint ('Printing custom test page ' + custom_testpage)
-@@ -2085,11 +2075,9 @@ class NewPrinterGUI(QDialog):
+@@ -2090,11 +2080,9 @@
          #self.connect(self.btnNCAddMember, SIGNAL("clicked()"), self.slot_btnNCAddMember_clicked)
          #self.connect(self.btnNCDelMember, SIGNAL("clicked()"), self.slot_btnNCDelMember_clicked)
  
diff --git a/debian/patches/03_system_config_printer_kde_issues.diff b/debian/patches/03_system_config_printer_kde_issues.diff
deleted file mode 100644
index fa78008..0000000
--- a/debian/patches/03_system_config_printer_kde_issues.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 578b501..5c9dfdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_system_config_printer_kde_cupsutils.diff
 02_kuser_first_uid_gid_fix.diff
-03_system_config_printer_kde_issues.diff
 05_system_config_printer_kde_scroll_printer_options.diff

-- 
KDE Admin module packaging



More information about the pkg-kde-commits mailing list