[SCM] qttools packaging branch, ubuntu+1, updated. debian/5.9.2-4-11-g142d3dd

[Simon Quigley]

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

The following commit has been merged in the ubuntu+1 branch:
commit b9db5c98fba42d02d6e9b07036bc3bfc29da91f1
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sun Dec 3 15:04:03 2017 -0600

    Temporarily disable qtwebkit support.
---
 debian/changelog | 4 ++--
 debian/control   | 1 -
 debian/rules     | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a00e753..2ae2e9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-qttools-opensource-src (5.9.3-0ubuntu2) bionic; urgency=medium
+qttools-opensource-src (5.9.3-0ubuntu2+1) bionic; urgency=medium
 
-  * Lower build dep on qt5webkit.
   * New upstream release.
   * Update Standards-version to 4.1.2, no changes needed.
+  * Temporarily disable qtwebkit support.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 30 Nov 2017 23:08:20 -0600
 
diff --git a/debian/control b/debian/control
index 264cc60..aa0055d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
 Build-Depends: debhelper (>= 10.9.2~),
                libqt5opengl5-dev (>= 5.9.3+dfsg~),
                libqt5sql5-sqlite (>= 5.9.3+dfsg~),
-               libqt5webkit5-dev (>= 5.9.2~) [!alpha !m68k !sh4],
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.9.3~),
                qtdeclarative5-private-dev (>= 5.9.3~),
diff --git a/debian/rules b/debian/rules
index 8423d97..71f4c78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,11 +43,7 @@ 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