[SCM] qtscript packaging branch, experimental, updated. debian/5.5.1+dfsg-2-6-g96f6d97

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 96f6d9744ca94bd005119f402d9cfefa5160ea3e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 3 10:38:57 2016 +0300

    Re-enable building the documentation.
    
    - See debian/README.source in qtbase for details on how we handle it.
    - Add libqt5sql5-sqlite and qttools5-dev-tools to Build-Depends-Indep.
---
 debian/changelog |  3 +++
 debian/control   | 13 +++++++++++++
 debian/rules     |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3b8ac8..d60afac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ qtscript-opensource-src (5.6.0~beta+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Update debian/watch to track experimental releases (needs to be reverted
     before uploading 5.6.0 final).
+  * Re-enable building the documentation.
+    - See debian/README.source in qtbase for details on how we handle it.
+    - Add libqt5sql5-sqlite and qttools5-dev-tools to Build-Depends-Indep.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 02 Feb 2016 14:10:26 -0300
 
diff --git a/debian/control b/debian/control
index 952c091..f4fc6c8 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,8 @@ Build-Depends: debhelper (>= 9),
                qtbase5-private-dev (>= 5.6.0~beta+dfsg~),
                xauth,
                xvfb
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~),
+                     qttools5-dev-tools (>= 5.6.0~)
 Standards-Version: 3.9.6
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtscript.git
@@ -103,6 +105,17 @@ Description: Qt 5 script libraries debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 script 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: qtscript5-doc-html
 Priority: extra
 Architecture: all
diff --git a/debian/rules b/debian/rules
index a5d90cb..8bd12ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_auto_configure:
 	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
-	dh_auto_build -Smakefile -- html_docs
+	dh_auto_build -- docs
 
 override_dh_auto_install-arch:
 	dh_auto_install
@@ -25,7 +25,7 @@ override_dh_auto_install-arch:
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 override_dh_auto_install-indep:
-	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
+	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qtscript packaging