[SCM] qttools packaging branch, experimental, updated. debian/5.7.1-1-5-ge2aa184

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 0bc9b6bb3bd023087c9f8b279d1cd30e8b674476
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun May 7 19:28:34 2017 +0300

    Temporarily disable webkit support (there are no webkit 5.9 tarballs yet).
---
 debian/changelog | 1 +
 debian/control   | 1 -
 debian/rules     | 4 ----
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ca38dc..4858595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qttools-opensource-src (5.9.0~beta3-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream beta release.
+  * Temporarily disable webkit support (there are no webkit 5.9 tarballs yet).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 Dec 2016 00:31:23 +0300
 
diff --git a/debian/control b/debian/control
index d5be173..b600ded 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
 Build-Depends: debhelper (>= 9.20160114~),
                libqt5opengl5-dev (>= 5.7.1+dfsg~),
                libqt5sql5-sqlite (>= 5.7.1+dfsg~),
-               libqt5webkit5-dev (>= 5.7.1+dfsg~) [!m68k !sh4],
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.7.1+dfsg~),
                qtdeclarative5-private-dev (>= 5.7.1~20161021~),
diff --git a/debian/rules b/debian/rules
index 9f539a9..f1c370e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,11 +48,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