[SCM] qttools packaging branch, master, updated. debian/5.6.1-2-6-g37c0b5b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 37c0b5b68c13a3e131eac4fa3120b3589f578a7f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Oct 25 13:11:28 2016 -0300

    Do not install the qwebview plugin on archs that do not have qtwebkit support.
---
 debian/changelog                                                 | 4 ++++
 ...{qttools5-dev-tools.install => qttools5-dev-tools.install.in} | 0
 debian/rules                                                     | 9 +++++++++
 3 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cd171c1..f171e63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qttools-opensource-src (5.6.1-4) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Do not install the qwebview plugin on archs that do not have qtwebkit
+    support (Closes: #840693).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 19 Oct 2016 20:43:27 -0300
 
 qttools-opensource-src (5.6.1-3) unstable; urgency=medium
diff --git a/debian/qttools5-dev-tools.install b/debian/qttools5-dev-tools.install.in
similarity index 100%
rename from debian/qttools5-dev-tools.install
rename to debian/qttools5-dev-tools.install.in
diff --git a/debian/rules b/debian/rules
index 836ddb9..031ce1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,9 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
+# Archs that do not build depend on QtWebkit do not ship qwebview.
+no_qwebview_archs := sh4 m68k
+
 %:
 	dh $@ --with pkgkde_symbolshelper --parallel
 
@@ -21,6 +24,7 @@ override_dh_auto_configure:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -fv .qmake.cache
+	rm -fv debian/qttools5-dev-tools.install
 
 override_dh_auto_build-indep:
 	cd src; qmake
@@ -44,6 +48,11 @@ override_dh_auto_install-indep:
 	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
 override_dh_install:
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_qwebview_archs)))
+	grep -v qwebview debian/qttools5-dev-tools.install.in >> debian/qttools5-dev-tools.install
+else
+	cp debian/qttools5-dev-tools.install.in debian/qttools5-dev-tools.install
+endif
 	dh_install --fail-missing
 
 override_dh_strip:

-- 
qttools packaging