rev 15328 - in trunk/packages/kdeadmin/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Fri Jul 17 15:13:24 UTC 2009
Author: fabo
Date: 2009-07-17 15:13:23 +0000 (Fri, 17 Jul 2009)
New Revision: 15328
Removed:
trunk/packages/kdeadmin/debian/patches/04_system_config_printer_kde_fix_split.diff
Modified:
trunk/packages/kdeadmin/debian/changelog
trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
trunk/packages/kdeadmin/debian/patches/series
Log:
Merge system-config-printer-kde patches for cupsutils usage and the split.
Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog 2009-07-17 14:30:18 UTC (rev 15327)
+++ trunk/packages/kdeadmin/debian/changelog 2009-07-17 15:13:23 UTC (rev 15328)
@@ -6,7 +6,7 @@
* Fix "gnome/gtk/glade dependencies" in system-config-printer-kde by
including Josselin Mouette's patch to cope with system-config-printer
- split. (Closes: #525558)
+ split. (Closes: #525558, #536233)
+++ Changes by Martin Alfke
@@ -17,6 +17,7 @@
* Bump kdepimlibs-dev build dependency to >= 4:4.2.96.
* Bump Standards-Version from 3.8.1 to 3.8.2 (no changes needed).
+ * Merge system-config-printer-kde patches for cupsutils usage and the split.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 17 Jul 2009 12:17:57 +0200
@@ -113,7 +114,7 @@
kdeadmin (4:4.1.0-1) experimental; urgency=low
- * New upstream release.
+ * New upstream release.
* Remove 97_fix_target_link_libraries, no longer needed.
-- Ana Beatriz Guerrero Lopez <ana at debian.org> Mon, 28 Jul 2008 06:49:42 +0200
Modified: trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff 2009-07-17 14:30:18 UTC (rev 15327)
+++ trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff 2009-07-17 15:13:23 UTC (rev 15328)
@@ -1,3 +1,7 @@
+Description: Cope with system-config-printer split (now depends only on python-cupsutils)
+Origin: vendor: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525558#21
+Bug-Debian: http://bugs.debian.org/525558
+
--- a/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
+++ b/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
@@ -8,7 +8,7 @@ SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/
@@ -11,30 +15,62 @@
print "Groovy"
--- a/system-config-printer-kde/system-config-printer-kde.py
+++ b/system-config-printer-kde/system-config-printer-kde.py
-@@ -35,7 +35,7 @@ import sys, os, time, traceback, re, tem
+@@ -33,11 +33,6 @@ import locale
- #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"
+ import sys, os, time, traceback, re, tempfile, httplib, thread
+
+-#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"
-if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
-+if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/config.py"):
- sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
-
+- sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
+-
from PyQt4.QtCore import *
-@@ -67,10 +67,11 @@ cups.require ("1.9.27")
+ from PyQt4.QtGui import *
+ from PyQt4 import uic
+@@ -66,11 +61,14 @@ import cups
+ cups.require ("1.9.27")
# These come from system-config-printer
- import config
+-import config
-import cupshelpers, options
+import cupsutils.ppds
-+from cupsutils import cupshelpers, options
++try:
++ import cupshelpers, options
++except ImportError:
++ from cupsutils import cupshelpers, options
from optionwidgets import OptionWidget
- from smburi import SMBURI
+-from smburi import SMBURI
-from debug import *
++from cupsutils.smburi import SMBURI
+from cupsutils.debug import *
import dbus
import dbus.mainloop.qt
-@@ -2297,7 +2298,7 @@ class NewPrinterGUI(QDialog):
+@@ -898,10 +896,6 @@ class GUI(QWidget):
+ # otherwise use cups' default one
+ custom_testpage = None
+ opt = self.ppd.findOption ("PageSize")
+- if opt:
+- print opt
+- custom_testpage = os.path.join(SYSTEM_CONFIG_PRINTER_DIR, 'testpage-%s.ps' % opt.defchoice.lower())
+- print custom_testpage
+
+ if custom_testpage and os.path.exists(custom_testpage):
+ debugprint ('Printing custom test page ' + custom_testpage)
+@@ -2084,10 +2078,8 @@ class NewPrinterGUI(QDialog):
+ #self.connect(self.btnNCDelMember, SIGNAL("clicked()"), self.slot_btnNCDelMember_clicked)
+
+ # Optionally disable downloadable driver support.
+- #if not config.DOWNLOADABLE_DRIVER_SUPPORT:
+- if True:
+- self.rbtnNPDownloadableDriverSearch.setEnabled(False)
+- self.downloadableDriverSearchFrame.hide()
++ self.rbtnNPDownloadableDriverSearch.setEnabled(False)
++ self.downloadableDriverSearchFrame.hide()
+
+ """
+ # Set up OpenPrinting widgets.
+@@ -2297,7 +2289,7 @@ class NewPrinterGUI(QDialog):
c = cups.Connection ()
debugprint ("Fetching PPDs")
ppds_dict = c.getPPDs()
@@ -43,7 +79,7 @@
language=language)
debugprint ("Closing connection (PPDs)")
del c
-@@ -2523,7 +2524,7 @@ class NewPrinterGUI(QDialog):
+@@ -2523,7 +2515,7 @@ class NewPrinterGUI(QDialog):
ppddict = self.ppds.getInfoFromPPDName (ppdname)
make_model = ppddict['ppd-make-and-model']
(make, model) = \
@@ -52,7 +88,7 @@
self.auto_make = make
self.auto_model = model
except:
-@@ -2892,7 +2893,7 @@ class NewPrinterGUI(QDialog):
+@@ -2892,7 +2884,7 @@ class NewPrinterGUI(QDialog):
if make_and_model and not device.id:
mk = None
md = None
Modified: trunk/packages/kdeadmin/debian/patches/series
===================================================================
--- trunk/packages/kdeadmin/debian/patches/series 2009-07-17 14:30:18 UTC (rev 15327)
+++ trunk/packages/kdeadmin/debian/patches/series 2009-07-17 15:13:23 UTC (rev 15328)
@@ -1,3 +1,2 @@
01_system_config_printer_kde_cupsutils.diff
02_kuser_first_uid_gid_fix.diff
-04_system_config_printer_kde_fix_split.diff
More information about the pkg-kde-commits
mailing list