[SCM] KDE Admin module packaging branch, master, updated. debian/4.6.5-2

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 1746996cd68d63ceef688ec7dd5936d25d371b9f
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Jul 20 00:54:47 2011 +0300

    Switch to dh_python2.
    
    ... and actually enable byte-compilation for system-config-printer-kde.
---
 debian/changelog |    3 +++
 debian/control   |    4 ++--
 debian/rules     |    5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cee790..839462a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdeadmin (4:4.6.5-2) UNRELEASED; urgency=low
 
+  [ Modestas Vainius ]
+  * Switch to dh_python2 and actually enable byte-compilation for
+    system-config-printer-kde.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 20 Jul 2011 00:53:20 +0300
 
diff --git a/debian/control b/debian/control
index 97ca784..54edc79 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin
  José Manuel Santamaría Lema <panfaust at gmail.com>
 Build-Depends: kde-sc-dev-latest (>= 4:4.6.5),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdepimlibs5-dev (>= 4:4.6), docbook-to-man, python-support
+ kdepimlibs5-dev (>= 4:4.6), docbook-to-man, python
 Standards-Version: 3.9.2
 Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdeadmin.git
@@ -91,7 +91,7 @@ Description: user and group administration tool
 Package: system-config-printer-kde
 Section: admin
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-qt4-dbus,
+Depends: ${python:Depends}, ${misc:Depends}, python-qt4-dbus,
  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
diff --git a/debian/rules b/debian/rules
index 77a9acb..f5c48f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-dh = --with=python-support
+dh = --with=python2
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
@@ -11,3 +11,6 @@ override_dh_auto_configure:
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=kdeadmin-dbg
+
+override_dh_python2:
+	$(overridden_command) -p system-config-printer-kde /usr/share/kde4/apps/system-config-printer-kde

-- 
KDE Admin module packaging