[SCM] qttools packaging branch, experimental, updated. debian/5.9.0-beta3-1-4-g1a62d1c

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 1a62d1c4e15d43e334214e0264d57acebedced6a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jun 8 12:11:20 2017 +0300

    Re-enable webkit support.
---
 debian/changelog | 3 +++
 debian/control   | 1 +
 debian/rules     | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 00ce8e6..4a442aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qttools-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
   [ Simon Quigley ]
   * New upstream release.
 
+  [ Dmitry Shachnev ]
+  * Re-enable webkit support.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 04 Jun 2017 18:18:06 -0500
 
 qttools-opensource-src (5.9.0~beta3-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 73a2767..937bdc1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
 Build-Depends: debhelper (>= 9.20160114~),
                libqt5opengl5-dev (>= 5.9.0+dfsg~),
                libqt5sql5-sqlite (>= 5.9.0+dfsg~),
+               libqt5webkit5-dev (>= 5.9.0+dfsg~) [!m68k !sh4],
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.9.0+dfsg~),
                qtdeclarative5-private-dev (>= 5.9.0~),
diff --git a/debian/rules b/debian/rules
index 34d24ad..378e732 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +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
 
 	install -D -p -m0644 src/assistant/assistant/images/assistant-128.png \

-- 
qttools packaging