Bug#592900: Use python-cupshelpers instead of python-cupsutils
Although the patch to the python from 4:4.4.5-1.1 was included in 4:4.4.5-2 it looks like the control file wasn't changed to depend on python-cupshelpers instead of python-cupsutils. I can't currently install on my sid system. -- To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/201009011055.0.d...@spectralmud.org
Bug#592900: Use python-cupshelpers instead of python-cupsutils
Hi,
On Sun, Aug 15, 2010 at 12:01:57AM +0300, Modestas Vainius wrote:
Hello,
On šeštadienis 14 Rugpjūtis 2010 22:46:22 Guido Günther wrote:
Could you ask release team if they will accept it? I would like to
minimize posibility of reverting.
I'd be happy to but shouldn't we push a version of
system-config-printer-kde into experimental first so the release team
sees that there's everything in place? I could NMU that one if it helps.
Just ask if they agree to accept a new package to squeeze (which they might
refuse as it isn't exactly by the rules of freeze).
Btw, I didn't understand where you wanted an upload to happen? If
experimental, then I would say feel free to NMU with your change only if
that's what's needed to persuade release team. If unstable, please don't NMU.
I NMUed to experimental. The diff is attached.
Cheeers,
-- Guido
diff --git a/debian/changelog b/debian/changelog
index 1ea9a8a..71d9632 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdeadmin (4:4.4.5-1.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Use python-cupshelpers instead of python-cupsutils (Closes: #592900)
+
+ -- Guido Günther a...@sigxcpu.org Sun, 15 Aug 2010 20:21:53 +0200
+
kdeadmin (4:4.4.5-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 6773527..ef40e7f 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Package: system-config-printer-kde
Section: admin
Architecture: all
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-qt4-dbus,
- python-kde4 (= 4:4.2.0), python-cupsutils (= 1.0.0-6)
+ python-kde4 (= 4:4.2.0), python-cupshelpers (= 1.2.3-0.2~)
Description: printer configuration utility
This package contains a KDE application which can be used to configure
and manage printers.
diff --git a/debian/patches/01_system_config_printer_kde_cupsutils.diff b/debian/patches/01_system_config_printer_kde_cupsutils.diff
index e5b1cbf..d27d5e0 100644
--- a/debian/patches/01_system_config_printer_kde_cupsutils.diff
+++ b/debian/patches/01_system_config_printer_kde_cupsutils.diff
@@ -1,28 +1,19 @@
-Description: Cope with system-config-printer split (now depends only on python-cupsutils)
+Description: Cope with system-config-printer split (now depends only on python-cupshelpers)
Thanks to Josselin Mouette for the orginal patch.
Origin: vendor: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525558#21
Bug-Debian: http://bugs.debian.org/525558
Author: Didier Raboud did...@raboud.com
-Last-Update: 2009-08-09
+Last-Update: 2010-08-13
-Index: kdeadmin-4.3.0/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
-===
kdeadmin-4.3.0.orig/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py 2009-08-09 00:36:41.0 +0200
-+++ kdeadmin-4.3.0/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py 2009-08-09 11:25:52.0 +0200
-@@ -8,7 +8,7 @@
- sys.path.append (SYSTEM_CONFIG_PRINTER_DIR)
-
- try:
--import cupshelpers.ppds, cupshelpers.cupshelpers
-+import cupsutils.ppds, cupsutils.cupshelpers
- except:
- exit(1)
- print Groovy
-Index: kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py
-===
kdeadmin-4.3.0.orig/system-config-printer-kde/system-config-printer-kde.py 2009-08-09 00:36:41.0 +0200
-+++ kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py 2009-08-09 12:00:54.0 +0200
-@@ -33,11 +33,6 @@
+---
+ .../system-config-printer-kde.py | 28 ++-
+ 1 files changed, 9 insertions(+), 19 deletions(-)
+
+diff --git a/system-config-printer-kde/system-config-printer-kde.py b/system-config-printer-kde/system-config-printer-kde.py
+index 650d665..02c71eb 100755
+--- 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
import sys, os, time, traceback, re, tempfile, httplib, thread
@@ -34,7 +25,7 @@ Index: kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4 import uic
-@@ -65,12 +60,16 @@
+@@ -65,12 +60,13 @@ uic.properties.Properties._string = translate
import cups
cups.require (1.9.27)
@@ -42,21 +33,18 @@ Index: kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py
-import config
-import cupshelpers, options
+# These come from python-cupsutils
-+import cupsutils.ppds
-+try:
-+import cupshelpers
-+except ImportError:
-+from cupsutils import cupshelpers
++import cupshelpers.ppds
++from cupshelpers import cupshelpers
+import options
from optionwidgets import OptionWidget
-from smburi import SMBURI
-from debug import *
-+from cupsutils.smburi import SMBURI
-+from
Bug#592900: Use python-cupshelpers instead of python-cupsutils
Hello, On penktadienis 13 Rugpjūtis 2010 21:43:25 Guido Günther wrote: Hi, attached patch makes system-config-printer-kde use python-cupshelpers. The package got renamed to match upstreams name and is currently sitting in experimental. I'd be great to have this applied so a new system-config-printer can be moved into unstable. Is this squeeze material? -- To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/201008141222.14986.modes...@vainius.eu
Bug#592900: Use python-cupshelpers instead of python-cupsutils
Hi, On Sat, Aug 14, 2010 at 12:22:14PM +0300, Modestas Vainius wrote: Hello, On penktadienis 13 Rugpjūtis 2010 21:43:25 Guido Günther wrote: Hi, attached patch makes system-config-printer-kde use python-cupshelpers. The package got renamed to match upstreams name and is currently sitting in experimental. I'd be great to have this applied so a new system-config-printer can be moved into unstable. Is this squeeze material? I hope so. I've not pushed s-c-p into unstable since I'd break s-c-p-kde yet. I'd be great if we could sort this out in time for squeeze since the new release fixes so many bugs: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=system-config-printer Cheers, -- Guido -- To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20100814135532.ga8...@bogon.sigxcpu.org
Bug#592900: Use python-cupshelpers instead of python-cupsutils
Hi Modestas, On Sat, Aug 14, 2010 at 09:48:18PM +0300, Modestas Vainius wrote: Hello, On šeštadienis 14 Rugpjūtis 2010 16:55:32 Guido Günther wrote: Is this squeeze material? I hope so. I've not pushed s-c-p into unstable since I'd break s-c-p-kde yet. I'd be great if we could sort this out in time for squeeze since the new release fixes so many bugs: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=system-config-printer Could you ask release team if they will accept it? I would like to minimize posibility of reverting. I'd be happy to but shouldn't we push a version of system-config-printer-kde into experimental first so the release team sees that there's everything in place? I could NMU that one if it helps. Cheers, -- Guido -- To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20100814194621.ga7...@bogon.sigxcpu.org
Bug#592900: Use python-cupshelpers instead of python-cupsutils
Hello, On šeštadienis 14 Rugpjūtis 2010 22:46:22 Guido Günther wrote: Could you ask release team if they will accept it? I would like to minimize posibility of reverting. I'd be happy to but shouldn't we push a version of system-config-printer-kde into experimental first so the release team sees that there's everything in place? I could NMU that one if it helps. Just ask if they agree to accept a new package to squeeze (which they might refuse as it isn't exactly by the rules of freeze). Btw, I didn't understand where you wanted an upload to happen? If experimental, then I would say feel free to NMU with your change only if that's what's needed to persuade release team. If unstable, please don't NMU. -- To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/201008150001.58188.modes...@vainius.eu
Bug#592900: Use python-cupshelpers instead of python-cupsutils
Package: system-config-printer-kde
Version: 4:4.4.5-1
Severity: normal
Tags: patch
Hi,
attached patch makes system-config-printer-kde use python-cupshelpers.
The package got renamed to match upstreams name and is currently sitting
in experimental.
I'd be great to have this applied so a new system-config-printer can be
moved into unstable.
The first attached patch can be applied to the Debian package as is. The
second patch is just for reference, it shows the changes that need to be
made to the upstream source.
Cheers,
-- Guido
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
From 5c6b8fe479bb337e720f22aec7672e166f30555f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= a...@sigxcpu.org
Date: Fri, 13 Aug 2010 19:36:56 +0200
Subject: [PATCH] Use python-cupshelpers instead of python-cupsutils
---
debian/control |2 +-
.../01_system_config_printer_kde_cupsutils.diff| 76 +---
2 files changed, 20 insertions(+), 58 deletions(-)
diff --git a/debian/control b/debian/control
index 6773527..9bbe37e 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Package: system-config-printer-kde
Section: admin
Architecture: all
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-qt4-dbus,
- python-kde4 (= 4:4.2.0), python-cupsutils (= 1.0.0-6)
+ python-kde4 (= 4:4.2.0), python-cupshelpers (= 1.2.3-0.2~)
Description: printer configuration utility
This package contains a KDE application which can be used to configure
and manage printers.
diff --git a/debian/patches/01_system_config_printer_kde_cupsutils.diff b/debian/patches/01_system_config_printer_kde_cupsutils.diff
index e5b1cbf..fd577d7 100644
--- a/debian/patches/01_system_config_printer_kde_cupsutils.diff
+++ b/debian/patches/01_system_config_printer_kde_cupsutils.diff
@@ -1,28 +1,19 @@
-Description: Cope with system-config-printer split (now depends only on python-cupsutils)
+Description: Cope with system-config-printer split (now depends only on python-cupshelpers)
Thanks to Josselin Mouette for the orginal patch.
Origin: vendor: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525558#21
Bug-Debian: http://bugs.debian.org/525558
Author: Didier Raboud did...@raboud.com
-Last-Update: 2009-08-09
+Last-Update: 2010-08-13
-Index: kdeadmin-4.3.0/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
-===
kdeadmin-4.3.0.orig/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py 2009-08-09 00:36:41.0 +0200
-+++ kdeadmin-4.3.0/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py 2009-08-09 11:25:52.0 +0200
-@@ -8,7 +8,7 @@
- sys.path.append (SYSTEM_CONFIG_PRINTER_DIR)
-
- try:
--import cupshelpers.ppds, cupshelpers.cupshelpers
-+import cupsutils.ppds, cupsutils.cupshelpers
- except:
- exit(1)
- print Groovy
-Index: kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py
-===
kdeadmin-4.3.0.orig/system-config-printer-kde/system-config-printer-kde.py 2009-08-09 00:36:41.0 +0200
-+++ kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py 2009-08-09 12:00:54.0 +0200
-@@ -33,11 +33,6 @@
+---
+ .../system-config-printer-kde.py | 28 ++-
+ 1 files changed, 9 insertions(+), 19 deletions(-)
+
+diff --git a/system-config-printer-kde/system-config-printer-kde.py b/system-config-printer-kde/system-config-printer-kde.py
+index 650d665..02c71eb 100755
+--- 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
import sys, os, time, traceback, re, tempfile, httplib, thread
@@ -34,7 +25,7 @@ Index: kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4 import uic
-@@ -65,12 +60,16 @@
+@@ -65,12 +60,13 @@ uic.properties.Properties._string = translate
import cups
cups.require (1.9.27)
@@ -42,21 +33,18 @@ Index: kdeadmin-4.3.0/system-config-printer-kde/system-config-printer-kde.py
-import config
-import cupshelpers, options
+# These come from python-cupsutils
-+import cupsutils.ppds
-+try:
-+import cupshelpers
-+except ImportError:
-+from cupsutils import cupshelpers
++import cupshelpers.ppds
++from cupshelpers import cupshelpers
+import options
from optionwidgets import OptionWidget
-from smburi import SMBURI
-from debug import *
-+from cupsutils.smburi import SMBURI
-+from cupsutils.debug import *
++from cupshelpers.smburi import
