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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit b4a87a50252dbbdbe8a0eb08a9b14551246ae27d
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Mar 30 01:21:05 2011 +0300

    Switch debian/rules engine to dhmk based qt-kde-team/2/*.
    
    And require pkg-kde-tools 0.12, which has debian/man/* generation fix.
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |   13 +++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9e2bd9..7f78760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ kdeadmin (4:4.6.1-0r1) UNRELEASED; urgency=low
   * Adapt 05_system_config_printer_kde_scroll_printer_options.diff to upstream
     changes.
   * Strip sequence numbers from debian/patches/*.
+  * Switch debian/rules engine to dhmk based qt-kde-team/2/*:
+    - require pkg-kde-tools 0.12, which has debian/man/* generation fix.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sat, 11 Sep 2010 20:07:52 +0000
 
diff --git a/debian/control b/debian/control
index fc28f8f..a4fe36c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>,
  José Manuel Santamaría Lema <panfaust at gmail.com>
 Build-Depends: kde-sc-dev-latest (>= 4:4.6.1),
- cdbs (>= 0.4.51), cmake, debhelper (>= 7), pkg-kde-tools (>= 0.9),
+ cmake, debhelper (>= 7.2.7~), pkg-kde-tools (>= 0.12),
  kdepimlibs5-dev (>= 4:4.6), docbook-to-man, python-support
 Standards-Version: 3.9.1
 Homepage: http://www.kde.org/
diff --git a/debian/rules b/debian/rules
index 905a396..4ab36a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+dh = --with=python-support
 
-DEB_CMAKE_CUSTOM_FLAGS += -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-binary-install/system-config-printer-kde::
-	dh_pysupport -p$(cdbs_curpkg)
+override_dh_auto_configure:
+	$(overriden_command) -- -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE
+
+.PHONY: override_dh_auto_test
+
+override_dh_strip:
+	$(overriden_command) --dbg-package=kdeadmin-dbg

-- 
KDE Admin module packaging