[SCM] KDE Network module packaging branch, master, updated. debian/4.4.5-2-41-g5a54dbc

[Modestas Vainius]

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

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

diff --git a/debian/changelog b/debian/changelog
index bda89b6..efe6373 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ kdenetwork (4:4.6.1-0r4) UNRELEASED; urgency=low
   * Remove libjasper-runtime recommend from kopete, as now it uses the jasper
     library directly.
 
+  [ 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, 01 Sep 2010 18:14:10 +0300
 
 kdenetwork (4:4.4.5-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a2c3170..f1e9c09 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
  Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
  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.11),
  kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6),
  zlib1g-dev, libjpeg62-dev, libxml2-dev, libxslt1-dev, libssl-dev,
  libxdamage-dev, libxss-dev, libslp-dev, libidn11-dev, libxtst-dev,
diff --git a/debian/rules b/debian/rules
index b9817c9..d370058 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,25 @@
 #!/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
 
-DEB_FIXPERMS_EXCLUDE := usr/bin/kppp
+.PHONY: override_dh_auto_test
 
-#DEB_DH_MAKESHLIBS_ARGS_libkopete4 := -V'libkopete4 (>= 4:4.1.86)'
-DEB_DH_MAKESHLIBS_ARGS_libkopete4 := -V
+override_dh_install:
+	$(overriden_command)
+	if [ -d debian/kppp ]; then \
+	    chown root:dip debian/kppp/usr/bin/kppp && \
+	    chmod 4754 debian/kppp/usr/bin/kppp; \
+	fi
 
-DEB_DH_SHLIBDEPS_ARGS_libkopete4 := -- -xkopete
+override_dh_fixperms:
+	$(overriden_command) -Xusr/bin/kppp
 
-binary-install/kppp::
-	chown root:dip debian/kppp/usr/bin/kppp
-	chmod 4754 debian/kppp/usr/bin/kppp
+override_dh_makeshlibs:
+	$(overriden_command) -V
+
+override_dh_shlibdeps:
+	$(overriden_command) -plibkopete4 -- -xkopete
+	$(overriden_command) --remaining-packages
+
+override_dh_strip:
+	$(overriden_command) --dbg-package=kdenetwork-dbg

-- 
KDE Network module packaging