[SCM] qtmultimedia packaging branch, master, updated. debian/5.3.0-3-2-g8584ef9

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=8584ef9

The following commit has been merged in the master branch:
commit 8584ef96ea25cbcb2f148316898f579bd3832381
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jun 19 20:43:50 2014 +0400

    Do not install gstreamer libraries on Hurd.
---
 debian/changelog                                   |  2 ++
 debian/control                                     |  2 +-
 debian/libqt5multimedia5-plugins.install-common    |  2 ++
 ... => libqt5multimedia5-plugins.install-kfreebsd} |  2 --
 ...all => libqt5multimedia5-plugins.install-linux} |  2 --
 debian/rules                                       | 22 ++++++++++++++++++++++
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25a1b83..87a8d2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtmultimedia-opensource-src (5.3.0-4) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Do not install gstreamer libraries on Hurd.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Jun 2014 20:40:23 +0400
 
diff --git a/debian/control b/debian/control
index f0a3b63..9f3ee37 100644
--- a/debian/control
+++ b/debian/control
@@ -104,7 +104,7 @@ Description: Qt 5 AudioEngine QML module
  This package contains the AudioEngine QML module for QtDeclarative.
 
 Package: libqgsttools-p1
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/libqt5multimedia5-plugins.install-common b/debian/libqt5multimedia5-plugins.install-common
new file mode 100644
index 0000000..b3c1e67
--- /dev/null
+++ b/debian/libqt5multimedia5-plugins.install-common
@@ -0,0 +1,2 @@
+usr/lib/*/qt5/plugins/audio/libqtmedia_pulse.so
+usr/lib/*/qt5/plugins/playlistformats/libqtmultimedia_m3u.so
diff --git a/debian/libqt5multimedia5-plugins.install b/debian/libqt5multimedia5-plugins.install-kfreebsd
similarity index 67%
copy from debian/libqt5multimedia5-plugins.install
copy to debian/libqt5multimedia5-plugins.install-kfreebsd
index d331887..390ed02 100644
--- a/debian/libqt5multimedia5-plugins.install
+++ b/debian/libqt5multimedia5-plugins.install-kfreebsd
@@ -1,6 +1,4 @@
-usr/lib/*/qt5/plugins/audio/libqtmedia_pulse.so
 usr/lib/*/qt5/plugins/mediaservice/libgstaudiodecoder.so
 usr/lib/*/qt5/plugins/mediaservice/libgstcamerabin.so
 usr/lib/*/qt5/plugins/mediaservice/libgstmediacapture.so
 usr/lib/*/qt5/plugins/mediaservice/libgstmediaplayer.so
-usr/lib/*/qt5/plugins/playlistformats/libqtmultimedia_m3u.so
diff --git a/debian/libqt5multimedia5-plugins.install b/debian/libqt5multimedia5-plugins.install-linux
similarity index 67%
rename from debian/libqt5multimedia5-plugins.install
rename to debian/libqt5multimedia5-plugins.install-linux
index d331887..390ed02 100644
--- a/debian/libqt5multimedia5-plugins.install
+++ b/debian/libqt5multimedia5-plugins.install-linux
@@ -1,6 +1,4 @@
-usr/lib/*/qt5/plugins/audio/libqtmedia_pulse.so
 usr/lib/*/qt5/plugins/mediaservice/libgstaudiodecoder.so
 usr/lib/*/qt5/plugins/mediaservice/libgstcamerabin.so
 usr/lib/*/qt5/plugins/mediaservice/libgstmediacapture.so
 usr/lib/*/qt5/plugins/mediaservice/libgstmediaplayer.so
-usr/lib/*/qt5/plugins/playlistformats/libqtmultimedia_m3u.so
diff --git a/debian/rules b/debian/rules
index 7436eba..66bc37c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,11 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
+# Retrieve packages that have a .install-common file
+pkgs_with_common = $(patsubst debian/%.install-common,%,$(wildcard debian/*.install-common))
+# Retrieve packages that have a .install-$DEB_HOST_ARCH_OS file
+pkgs_with_os = $(patsubst debian/%.install-$(DEB_HOST_ARCH_OS),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH_OS)))
+
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtmultimedia5-dbg
 
@@ -41,5 +46,22 @@ override_dh_auto_install-arch:
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
+override_dh_clean:
+	# Don't forget to remove the .install files we generated.
+	for pkg in $(pkgs_with_common); do \
+		rm -f debian/$$pkg.install ; \
+	done
+	for pkg in $(pkgs_with_os); do \
+		rm -f debian/$$pkg.install ; \
+	done
+	dh_clean
+
 override_dh_install:
+	# Now flush all the .install-* files as .install files.
+	set -e; for pkg in $(pkgs_with_common); do \
+		cat debian/$$pkg.install-common >> debian/$$pkg.install ; \
+	done
+	set -e; for pkg in $(pkgs_with_os); do \
+		cat debian/$$pkg.install-$(DEB_HOST_ARCH_OS) >> debian/$$pkg.install ; \
+	done
 	dh_install --fail-missing

-- 
qtmultimedia packaging