[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.6.1-2-8-g16b9db8

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit f386b31cbc7e1a3459e96b9791f693dcc79b78dd
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Aug 16 21:02:54 2016 +0300

    Clean up unused code in debian/rules.
---
 debian/changelog |  1 +
 debian/rules     | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0dacad..dc8523d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtmultimedia-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.7.0.
   * Drop obsolete Breaks/Replaces.
   * Switch to automatic dbgsym packages.
+  * Clean up unused code in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Aug 2016 21:28:56 +0300
 
diff --git a/debian/rules b/debian/rules
index 8fe60ff..e5e0577 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,6 @@ export QT_SELECT := qt5
 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
@@ -65,10 +63,6 @@ override_dh_install:
 		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
@@ -85,9 +79,5 @@ override_dh_clean:
 		rm -f debian/$$pkg.install ; \
 	done
 
-	for pkg in $(pkgs_with_os); do \
-		rm -f debian/$$pkg.install ; \
-	done
-
 override_dh_strip:
 	dh_strip --dbgsym-migration='qtmultimedia5-dbg (<< 5.7.0-1~)'

-- 
qtmultimedia packaging