[SCM] qtsensors packaging branch, master, updated. debian/5.2.0+dfsg-2

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Jan 31 23:23:43 UTC 2014


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

The following commit has been merged in the master branch:
commit 52da69d76ae9adff1bc8a862e0f2e95e03a773da
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 24 18:28:22 2013 +0100

    bring the $pkg.install-$foo structure from qtbase
    
    yay for untested commits, not even with "magic tools" ...
---
 debian/rules | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/debian/rules b/debian/rules
index 922cefb..c3b9807 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,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=qtsensors5-dbg
 
@@ -39,11 +44,32 @@ override_dh_auto_install:
 	rm -fv debian/tmp/usr/share/qt5/mkspecs/modules/qt_lib_sensors_private.pri
 
 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
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+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_os); do \
+		rm -f debian/$$pkg.install ; \
+	done
+
 prune-nonfree:
 	# Remove minified jquery without source.
 	rm -fv doc/config/scripts/jquery.js

-- 
qtsensors packaging



More information about the pkg-kde-commits mailing list