rev 12858 - in branches/kde4.2/packages/kdeadmin/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Fri Dec 5 22:07:10 UTC 2008
Author: modax-guest
Date: 2008-12-05 22:07:10 +0000 (Fri, 05 Dec 2008)
New Revision: 12858
Modified:
branches/kde4.2/packages/kdeadmin/debian/changelog
branches/kde4.2/packages/kdeadmin/debian/control
branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
Log:
Make system-config-printer-kde actually work
Modified: branches/kde4.2/packages/kdeadmin/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/changelog 2008-12-05 21:51:11 UTC (rev 12857)
+++ branches/kde4.2/packages/kdeadmin/debian/changelog 2008-12-05 22:07:10 UTC (rev 12858)
@@ -1,4 +1,4 @@
-kdeadmin (4:4.1.82+svn892103-0r2) UNRELEASED; urgency=low
+kdeadmin (4:4.1.82+svn892103-0r3) UNRELEASED; urgency=low
* New upstream development snapshot.
@@ -12,7 +12,7 @@
- add 01_system_config_printer_kde_cupsutils.diff patch to fix import
paths of cupshelpers which are cupsutils on Debian.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 05 Dec 2008 23:21:35 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 05 Dec 2008 23:57:46 +0200
kdeadmin (4:4.1.3-1) experimental; urgency=low
Modified: branches/kde4.2/packages/kdeadmin/debian/control
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/control 2008-12-05 21:51:11 UTC (rev 12857)
+++ branches/kde4.2/packages/kdeadmin/debian/control 2008-12-05 22:07:10 UTC (rev 12858)
@@ -5,7 +5,7 @@
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt,
kdepimlibs5-dev (>= 4:4.1.80), docbook-to-man,
- python-kde4 (>= 4:4.1.82), python-qt4-dev (>= 4.4.4), python-cups, python-cupsutils
+ python-kde4 (>= 4:4.1.82), python-qt4-dev (>= 4.4.4), python-cups, python-cupsutils (>= 1.0.0)
Standards-Version: 3.8.0
Homepage: http://www.kde.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdeadmin
@@ -91,7 +91,7 @@
Section: admin
Architecture: all
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
- python-kde4 (>= 4:4.1.82), system-config-printer
+ python-kde4 (>= 4:4.1.82), system-config-printer (>= 1.0.0)
Description: KDE 4 printer configuration utility
This package contains a KDE4 based application which can be used to configure
and manage printers.
Modified: branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff 2008-12-05 21:51:11 UTC (rev 12857)
+++ branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff 2008-12-05 22:07:10 UTC (rev 12858)
@@ -11,12 +11,63 @@
print "Groovy"
--- a/system-config-printer-kde/system-config-printer-kde.py
+++ b/system-config-printer-kde/system-config-printer-kde.py
-@@ -65,7 +65,7 @@
+@@ -34,7 +34,7 @@
+ #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)
+
+ from PyQt4.QtCore import *
+@@ -65,9 +65,10 @@
+
# These come from system-config-printer
import config
-import cupshelpers #, options
-+import cupsutils as cupshelpers #, options
++import cupsutils.ppds
++from cupsutils import cupshelpers #, options
from smburi import SMBURI
- from debug import *
+-from debug import *
++from cupsutils.debug import *
+ import dbus
+ import dbus.mainloop.qt
+@@ -1312,8 +1313,8 @@
+ self.lblPMakeModel.setText(printer.make_and_model)
+ state = self.printer_states.get (printer.state, i18nc("Printer state", "Unknown"))
+ state = self.printer_states.get (printer.state, i18nc("Printer state", "Unknown")).split(" - ")[0]
+- if len (reason) > 0:
+- state += ' - ' + reason
++# if len (reason) > 0:
++# state += ' - ' + reason
+ self.lblPState.setText(state)
+ if len (self.changed) == 0:
+ debugprint ("no changes yet: full printer properties update")
+@@ -1695,7 +1696,7 @@
+ c = cups.Connection ()
+ debugprint ("Fetching PPDs")
+ ppds_dict = c.getPPDs()
+- self.ppds_result = cupshelpers.ppds.PPDs(ppds_dict,
++ self.ppds_result = cupsutils.ppds.PPDs(ppds_dict,
+ language=language)
+ debugprint ("Closing connection (PPDs)")
+ del c
+@@ -1921,7 +1922,7 @@
+ ppddict = self.ppds.getInfoFromPPDName (ppdname)
+ make_model = ppddict['ppd-make-and-model']
+ (make, model) = \
+- cupshelpers.ppds.ppdMakeModelSplit (make_model)
++ cupsutils.ppds.ppdMakeModelSplit (make_model)
+ self.auto_make = make
+ self.auto_model = model
+ except:
+@@ -2293,7 +2294,7 @@
+ if make_and_model and not device.id:
+ mk = None
+ md = None
+- (mk, md) = cupshelpers.ppds.ppdMakeModelSplit (make_and_model)
++ (mk, md) = cupsutils.ppds.ppdMakeModelSplit (make_and_model)
+ device.id = "MFG:" + mk + ";MDL:" + md + ";DES:" + mk + " " + md + ";"
+ device.id_dict = cupshelpers.parseDeviceID (device.id)
+ # Check whether the device is supported by HPLIP and replace
More information about the pkg-kde-commits
mailing list