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

Modestas Vainius modax at alioth.debian.org
Fri Mar 11 01:38:38 UTC 2011


The following commit has been merged in the master branch:
commit 855b74b37a7e7e824b0d56f561181358aedbe34a
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Mar 11 03:31:55 2011 +0200

    Use $(overriden_command) and build-depend on pkg-kde-tools 0.11.
---
 debian/changelog |    2 +-
 debian/control   |    2 +-
 debian/rules     |   10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ebb37c9..d98e498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ phonon (4:4.6.0really4.4.4-2) UNRELEASED; urgency=low
     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;
+    - build-depend on pkg-kde-tools >= 0.11;
     - 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 1fc0142..a90c4ab 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.10), dpkg-dev (>= 1.15.5), automoc, libglib2.0-dev,
+ pkg-kde-tools (>= 0.11), 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 6550a39..7a94c80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,15 +11,15 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 RECOMMENDED_PHONON_BACKEND := phonon-backend-vlc
 
 override_dh_auto_configure:
-	$(configure_dh_auto_configure) -- -DPLUGIN_INSTALL_DIR=/usr/lib/qt4/
+	$(overriden_command) -- -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
+	$(overriden_command) -plibphonon4 -V'libphonon4 (>= $(dqk_upstream_version)), phonon'
+	$(overriden_command) -V --remaining-packages
 
 override_dh_shlibdeps:
-	dh_shlibdeps -- -xphonon
+	$(overriden_command) -- -xphonon
 
 override_dh_gencontrol:
 	# Expand some variables in maintainer scripts and debconf templates
@@ -32,4 +32,4 @@ override_dh_gencontrol:
 	        echo "$$cmd"; eval "$$cmd"; \
 	    fi; \
 	done
-	dh_gencontrol -- -Vphonon:Recommended-Backend=$(RECOMMENDED_PHONON_BACKEND)
+	$(overriden_command) -- -Vphonon:Recommended-Backend=$(RECOMMENDED_PHONON_BACKEND)

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list