[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.4.4-1-5-g5519cd3

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 5519cd3a7403ba19ef9116fc97a0eed9e531f419
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Mar 9 12:18:43 2011 +0200

    Switch debian/rules build engine to dhmk (qt-kde-team/2/*).
    
    - build-depend on pkg-kde-tools >= 0.10;
    - port debian/rules to dhmk keeping it dh compatible as much as possible.
---
 debian/changelog |    3 +++
 debian/control   |    2 +-
 debian/rules     |   40 ++++++++++++++++++++++++----------------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8c947a..ebb37c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ phonon (4:4.6.0really4.4.4-2) UNRELEASED; urgency=low
   * Bump libphonon-dev Breaks/Replaces to << 4:4.6.0really4.4.4 for
     libphononexperimental-dev. experimental/avcaptureinterface.h header which
     used to be there up to 4.4.4 (see changelog below).
+  * Switch debian/rules build engine to dhmk (qt-kde-team/2/*):
+    - build-depend on pkg-kde-tools >= 0.10;
+    - port debian/rules to dhmk keeping it dh compatible as much as possible.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 05 Mar 2011 11:59:29 +0200
 
diff --git a/debian/control b/debian/control
index a9f90ef..1fc0142 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Modestas Vainius <modax at debian.org>, Fathi Boudra <fabo at debian.org>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.4.13), cmake (>= 2.6.2),
- pkg-kde-tools (>= 0.9), dpkg-dev (>= 1.15.5), automoc, libglib2.0-dev,
+ pkg-kde-tools (>= 0.10), dpkg-dev (>= 1.15.5), automoc, libglib2.0-dev,
  libpulse-dev (>= 0.9.21), libqt4-dev (>= 4.5)
 Standards-Version: 3.9.1
 Homepage: http://phonon.kde.org/
diff --git a/debian/rules b/debian/rules
index e2b763f..1607e49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,35 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+dh = --dbg-package=phonon-dbg
 
-UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
-DEB_RECOMMENDED_PHONON_BACKEND := phonon-backend-vlc
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-DEB_DH_MAKESHLIBS_ARGS_libphonon4 = -V'libphonon4 (>= $(UPSTREAMVERSION)), phonon'
+# Enable strict interdependencies
+DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
+include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
-DEB_CMAKE_EXTRA_FLAGS += -DPLUGIN_INSTALL_DIR=/usr/lib/qt4/
-DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xphonon
-DEB_DH_GENCONTROL_ARGS_ALL := -- -Vphonon:Recommended-Backend=$(DEB_RECOMMENDED_PHONON_BACKEND)
+RECOMMENDED_PHONON_BACKEND := phonon-backend-vlc
 
-# Strict interdependencies for backends
-DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
-include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk
+override_dh_auto_configure:
+	$(configure_dh_auto_configure) -- -DPLUGIN_INSTALL_DIR=/usr/lib/qt4/
+
+# shlibs is needed for library-packages.mk (strict shlibs) to work
+override_dh_makeshlibs:
+	$(binary_dh_makeshlibs) -plibphonon4 -V'libphonon4 (>= $(dqk_upstream_version)), phonon'
+	$(binary_dh_makeshlibs) -V --remaining-packages
+
+override_dh_shlibdeps:
+	dh_shlibdeps -- -xphonon
 
-$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) :: binary-predeb/% :
-	@for f in debian/$(cdbs_curpkg)/DEBIAN/post* \
-	          debian/$(cdbs_curpkg)/DEBIAN/pre* \
-	          debian/$(cdbs_curpkg)/DEBIAN/config \
-	          debian/$(cdbs_curpkg)/DEBIAN/templates; do \
+override_dh_gencontrol:
+	# Expand some variables in maintainer scripts and debconf templates
+	@for f in debian/*/DEBIAN/post* \
+	          debian/*/DEBIAN/pre* \
+	          debian/*/DEBIAN/config \
+	          debian/*/DEBIAN/templates; do \
 	    if [ -f "$$f" ]; then \
-	        cmd="awk -f debian/expand_vars.awk -v recommended_backend='$(DEB_RECOMMENDED_PHONON_BACKEND)' -- $$f > $$f.tmp && cat $$f.tmp >| $$f && rm -f $$f.tmp"; \
+	        cmd="awk -f debian/expand_vars.awk -v recommended_backend='$(RECOMMENDED_PHONON_BACKEND)' -- $$f > $$f.tmp && cat $$f.tmp >| $$f && rm -f $$f.tmp"; \
 	        echo "$$cmd"; eval "$$cmd"; \
 	    fi; \
 	done
+	dh_gencontrol -- -Vphonon:Recommended-Backend=$(RECOMMENDED_PHONON_BACKEND)

-- 
Phonon Multimedia Framework packaging