[SCM] qt5webkit packaging branch, experimental, updated. debian/5.5.1+dfsg-2-4-gaf6961c

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ac0eb67fb52d2410ae1ab864bad602a5813c5932
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Mar 5 23:48:08 2016 +0300

    Add back qtwebkit5-doc package.
---
 debian/changelog |  1 +
 debian/control   | 15 ++++++++++++++-
 debian/rules     |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a22187..5cf5066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebkit-opensource-src (5.6.0~rc+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release candidate.
   * Bump Qt build-dependencies to 5.6.0~rc.
+  * Add back qtwebkit5-doc package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 05 Mar 2016 21:41:44 +0300
 
diff --git a/debian/control b/debian/control
index cbb643d..32faca2 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,9 @@ Build-Depends: bison,
                qtdeclarative5-private-dev (>= 5.6.0~rc~),
                qtscript5-private-dev (>= 5.6.0~rc+dfsg~),
                ruby
-Build-Depends-Indep: qtbase5-doc-html (>= 5.5.1+dfsg~)
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~rc+dfsg~),
+                     qtbase5-doc-html (>= 5.6.0~rc+dfsg~),
+                     qttools5-dev-tools (>= 5.6.0~)
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://trac.webkit.org/wiki/QtWebKit
@@ -96,6 +98,17 @@ Description: Web content engine library for Qt - debugging symbols
  .
  This package contains the debugging symbols for the Qt WebKit library.
 
+Package: qtwebkit5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 webkit documentation
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the documentation for the Qt 5 webkit libraries.
+
 Package: qtwebkit5-doc-html
 Priority: extra
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 0573183..c8bca65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ endif
 	qmake
 
 override_dh_auto_build-indep:
-	dh_auto_build -Smakefile -- html_docs
+	dh_auto_build -- docs
 
 override_dh_auto_install-arch:
 	make install INSTALL_ROOT=$(CURDIR)/debian/tmp
@@ -75,7 +75,7 @@ override_dh_auto_install-arch:
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 override_dh_auto_install-indep:
-	$(MAKE) -f Source/Makefile.api INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
+	dh_auto_build -- -f Source/Makefile.api INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qt5webkit packaging