[SCM] qttools packaging branch, experimental, updated. debian/5.2.1-8-6-gae687ed

[Lisandro Damián Nicanor Pérez]

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

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

    Also build qtscript5-doc from this source.
---
 debian/changelog |  4 ++--
 debian/control   | 12 ++++++++++++
 debian/rules     |  7 ++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8299c7..05d0954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ qttools-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Don't force dh_builddeb to use xz compression: it's already the default.
   * Build against qtwebkit to fix assistant (Closes: #742396):
-    - Build qtwebkit5-doc from this source thus allowing us to avoid a
-      circular dependency.
+    - Build qtwebkit5-doc and qtscript5-doc from this source, thus allowing us
+      to avoid a circular dependency.
     - Build depend upon libqt5webkit5-dev.
 
  -- 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 6f6f011..207bbb4 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends: debhelper (>= 9),
                zlib1g-dev
 Build-Depends-Indep: qtbase5-doc-html,
                      qtdeclarative5-doc-html,
+                     qtscript5-doc-html,
                      qtwebkit5-doc-html,
                      qtxmlpatterns5-doc-html
 Standards-Version: 3.9.5
@@ -198,6 +199,17 @@ Description: Qt 5 declarative documentation
  .
  This package contains the documentation for the Qt 5 declarative libraries.
 
+Package: qtscript5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 script 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 script libraries.
+
 Package: qttools5-doc
 Priority: extra
 Architecture: all
diff --git a/debian/rules b/debian/rules
index e73e6c0..f079899 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,9 @@ override_dh_auto_install-arch:
 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 qtwebkit; do \
+	                       qtopengl qtprintsupport qtscript qtscripttools qtsql \
+	                       qttestlib qtwidgets qtxml 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 +59,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 qtwebkit5; do \
+	for source in qtbase5 qtdeclarative5 qtscript5 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