[SCM] qttools packaging branch, experimental, updated. debian/5.2.1-8-5-ga950596

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit d5acbb0f2c6a257ca691db2bb4907f5c95c592d5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 17 23:17:11 2014 -0300

    Build qtwebkit5-doc from this source
    
    Avoid us a circular dependency when we add qtwebkit as B-D (next).
---
 debian/changelog |  3 +++
 debian/control   | 12 ++++++++++++
 debian/rules     |  4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35b74b4..f25fbf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qttools-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Don't force dh_builddeb to use xz compression: it's already the default.
+  * Build against qtwebkit to fix assistant:
+    - Build qtwebkit5-doc from this source thus allowing us to avoid a
+      circular dependency.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 May 2014 23:02:27 -0300
 
diff --git a/debian/control b/debian/control
index f0cbd5b..365d691 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 9),
                zlib1g-dev
 Build-Depends-Indep: qtbase5-doc-html,
                      qtdeclarative5-doc-html,
+                     qtwebkit5-doc-html,
                      qtxmlpatterns5-doc-html
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/
@@ -231,3 +232,14 @@ Description: Qt 5 XML patterns documentation
  .
  This package contains the documentation for the Qt 5 XML patterns
  libraries.
+
+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.
diff --git a/debian/rules b/debian/rules
index 601ef89..e73e6c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 	set -ex; for subdir in qdoc qmake qtconcurrent qtcore qtdbus qtgui qtnetwork \
 	                       qtopengl qtprintsupport qtsql qttestlib qtwidgets qtxml \
-	                       qtqml qtquick qtquickdialogs qtxmlpatterns; do \
+	                       qtqml qtquick qtquickdialogs qtxmlpatterns qtwebkit; do \
 		LD_LIBRARY_PATH=$(CURDIR)/lib $(CURDIR)/bin/qhelpgenerator \
 			/usr/share/qt5/doc/$$subdir/$$subdir.qhp -o \
 			$(CURDIR)/debian/tmp/usr/share/qt5/doc/$$subdir.qch; \
@@ -58,7 +58,7 @@ override_dh_install:
 override_dh_installdocs-indep:
 	dh_installdocs -i
 	# Use the correct copyright in external -doc packages
-	for source in qtbase5 qtdeclarative5 qtxmlpatterns5; do \
+	for source in qtbase5 qtdeclarative5 qtxmlpatterns5 qtwebkit5; do \
 		rm -v debian/$$source-doc/usr/share/doc/$$source-doc/copyright; \
 		cp /usr/share/doc/$$source-doc-html/copyright \
 			debian/$$source-doc/usr/share/doc/$$source-doc/; \

-- 
qttools packaging