[SCM] qtmultimedia packaging branch, master, updated. debian/5.4.2-1

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 9f6496e2d3d3e47a81cbe39ac0fd5c00261603d2
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Dec 15 09:43:06 2014 +0000

    Add qtmultimedia5-dev.install-armhf, rename qtmultimedia5-dev.install to qtmultimedia5-dev.install-common and update debian/rules to handle those similar to how it's done in qtbase.
---
 debian/changelog                                   |  3 ++
 debian/qtmultimedia5-dev.install-armhf             |  1 +
 ...ev.install => qtmultimedia5-dev.install-common} |  0
 debian/rules                                       | 38 ++++++++++++++++++++++
 4 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d848568..3cf1f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtmultimedia-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump build dependencies.
   * Update qtmultimedia-dev.install
+  * Add qtmultimedia5-dev.install-armhf, rename qtmultimedia5-dev.install
+    to qtmultimedia5-dev.install-common and update debian/rules to handle
+    those similar to how it's done in qtbase.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Dec 2014 07:55:37 +0000
 
diff --git a/debian/qtmultimedia5-dev.install-armhf b/debian/qtmultimedia5-dev.install-armhf
new file mode 100644
index 0000000..d02d6a8
--- /dev/null
+++ b/debian/qtmultimedia5-dev.install-armhf
@@ -0,0 +1 @@
+usr/lib/arm-linux-gnueabihf/cmake/Qt5Quick/Qt5Quick_QSGVideoNodeFactory_EGL.cmake
diff --git a/debian/qtmultimedia5-dev.install b/debian/qtmultimedia5-dev.install-common
similarity index 100%
rename from debian/qtmultimedia5-dev.install
rename to debian/qtmultimedia5-dev.install-common
diff --git a/debian/rules b/debian/rules
index cec88ea..5111cbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,13 @@ 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 file
+pkgs_with_arch = $(patsubst debian/%.install-$(DEB_HOST_ARCH),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH)))
+# 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
 
@@ -45,4 +52,35 @@ override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
 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_arch); do \
+		cat debian/$$pkg.install-$(DEB_HOST_ARCH) >> 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
+
+	# Call dh_install normally. It will process .install, .install.ARCH
+	# and/or .install.OS files.
 	dh_install --fail-missing
+
+override_dh_clean:
+	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_arch); do \
+		rm -f debian/$$pkg.install ; \
+	done
+
+	for pkg in $(pkgs_with_os); do \
+		rm -f debian/$$pkg.install ; \
+	done

-- 
qtmultimedia packaging