[SCM] KDE Multimedia module packaging branch, master, updated. debian/4.4.5-1-42-g36cb264

[Modestas Vainius]

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

    Switch debian/rules engine to dhmk based qt-kde-team/2/*.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 debian/rules     |   17 +++++++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd2f59d..2711cbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kdemultimedia (4:4.6.1-0r1) UNRELEASED; urgency=low
 
   [ Modestas Vainius ]
   * Point debian/control Vcs fields to the new Git repository.
+  * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
diff --git a/debian/control b/debian/control
index 0fdfb39..28f572e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo 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), libphonon-dev (>= 4:4.6.0really4.3.80),
  libasound2-dev (>= 1.0.14a) [linux-any],
  libcdparanoia-dev, libflac-dev, libmusicbrainz3-dev, libpulse-dev (>= 0.9.12), libxine-dev (>= 1.1.16.3),
diff --git a/debian/rules b/debian/rules
index b061d0b..9b2239e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,17 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+dh = --with=xine
 
-DEB_DH_MAKESHLIBS_ARGS_libkcddb4 := -V'libkcddb4 (>= 4:4.3.0)' -u-c0
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-binary-predeb/dragonplayer::
-	dh_xine -pdragonplayer
+.PHONY: override_dh_auto_test
+
+override_dh_makeshlibs:
+	$(overriden_command) -plibkcddb4 -V -- -c0
+	$(overriden_command) --remaining-packages
+
+override_dh_strip:
+	$(overriden_command) --dbg-package=kdemultimedia-dbg
+
+override_dh_xine:
+	$(overriden_command) -pdragonplayer

-- 
KDE Multimedia module packaging