[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.7-3-18-g5058fdd

[Modestas Vainius]

The following commit has been merged in the master branch:
commit b1186c2af49d2d4fed1196f09f76735aa941508a
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Mar 30 00:57:08 2011 +0300

    Switch debian/rules engine to dhmk based qt-kde-team/2/*.
---
 debian/changelog |    3 +++
 debian/control   |    2 +-
 debian/rules     |   14 +++++++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 243c1fc..528e625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ kdepim (4:4.4.10-0r1) UNRELEASED; urgency=low
   * Add jovie alternative to kttsd suggest.
   * Small touches at blogilo's description.
 
+  [ Modestas Vainius ]
+  * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Mar 2011 23:39:39 +0000
 
 kdepim (4:4.4.7-3) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 9227530..e0060b8 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 Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>,
  Michael Meskes <meskes at debian.org>
 Build-Depends: kde-sc-dev-latest (>= 4:4.6.1),
- cdbs, cmake, debhelper (>= 7.3), pkg-kde-tools (>= 0.9),
+ cmake, debhelper (>= 7.3), pkg-kde-tools (>= 0.11),
  kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), libphonon-dev (>= 4:4.6.0really4.3.80),
  libgpgme11-dev, libboost-dev (>= 1.40.0-2), libboost-graph-dev (>= 1.40.0-2), libsasl2-dev,
  xsltproc, libgnokii-dev, libxss-dev, libqca2-dev (>= 2.0.0), libassuan-dev,
diff --git a/debian/rules b/debian/rules
index 48b628d..e167f09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
+include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
-DEBIANVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
+.PHONY: override_dh_auto_test
 
 # Strict local dependencies (there are no external ones anyway)
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
-include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk
+override_dh_makeshlibs:
+	$(overriden_command) -V
+
+override_dh_strip:
+	$(overriden_command) --dbg-package=kdepim-dbg

-- 
KDE PIM module packaging