[SCM] qtlocation packaging branch, master, updated. 26be6eb6d14636cc93cc127e536900ca827746e0

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 26be6eb6d14636cc93cc127e536900ca827746e0
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 21 12:36:25 2013 +0100

    call dh_install with args in override
---
 debian/rules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index dbb8639..14d54d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
 %:
-	dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qtlocation5-dbg
+	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtlocation5-dbg
 
 override_dh_auto_configure:
 	qmake
@@ -26,6 +26,9 @@ override_dh_auto_install:
 	# Remove binary that includes libtheora in itself
 	rm -f debian/tmp/usr/lib/*/qt5/examples/qtlocation/declarative/mapviewer/qml_location_mapviewer
 
+override_dh_install:
+	dh_install --fail-missing
+
 override_dh_auto_test:
 	export LD_LIBRARY_PATH=$(CURDIR)/lib
 	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check

-- 
qtlocation packaging