[SCM] qttools packaging branch, master, updated. debian/5.9.2-2-3-g1aae768

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 1aae76863df32d6ccfda77e6921e53626a59b61b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Oct 26 16:36:52 2017 +0300

    Revert "Temporarily disable webkit support."
    
    This reverts commit bb3d5998a54e64f406ab2a5b0b4354f667838a9f.
---
 debian/changelog | 1 +
 debian/control   | 1 +
 debian/rules     | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 676d859..cc6039a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qttools-opensource-src (5.9.2-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Move Qt5LinguistTools*.cmake from qttools5-dev-tools to qttools5-dev.
+  * Re-enable qtwebkit support again.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Oct 2017 20:49:30 +0300
 
diff --git a/debian/control b/debian/control
index e264ea5..5886385 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
 Build-Depends: debhelper (>= 10),
                libqt5opengl5-dev (>= 5.9.2+dfsg~),
                libqt5sql5-sqlite (>= 5.9.2+dfsg~),
+               libqt5webkit5-dev (>= 5.9.2~) [!alpha !m68k !sh4],
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.9.2+dfsg-3~),
                qtdeclarative5-private-dev (>= 5.9.2~),
diff --git a/debian/rules b/debian/rules
index 27dbcd5..cb2cad1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ 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
+no_qwebview_archs := alpha sh4 m68k
 
 %:
 	dh $@ --with pkgkde_symbolshelper
@@ -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