[SCM] qttools packaging branch, master, updated. debian/5.2.1-7-3-gd29af4b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 724cc9c455b6e9f3ff1e99da2ec1536dd827cba8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Feb 11 20:17:32 2014 +0400

    Build qtdeclarative5-doc package from this source.
---
 debian/changelog                  |  2 ++
 debian/control                    | 13 ++++++++++++-
 debian/qtdeclarative5-doc.install |  3 +++
 debian/rules                      |  3 ++-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8defdf0..9877ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 qttools-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
   * Set version number to 5.2.1-3 to correctly handle upgrades
     for qtdeclarative5-doc package.
+  * Build qtdeclarative5-doc package from this source.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 11 Feb 2014 20:15:06 +0400
 
diff --git a/debian/control b/debian/control
index 32faab3..0efb141 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.2.1+dfsg-1~),
                zlib1g-dev
-Build-Depends-Indep: qtbase5-doc-html
+Build-Depends-Indep: qtbase5-doc-html, qtdeclarative5-doc-html
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qttools.git
@@ -182,6 +182,17 @@ Description: Qt 5 base documentation
  .
  This package contains the documentation for the Qt 5 base libraries.
 
+Package: qtdeclarative5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 declarative 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 declarative libraries.
+
 Package: qttools5-doc
 Priority: extra
 Architecture: all
diff --git a/debian/qtdeclarative5-doc.install b/debian/qtdeclarative5-doc.install
new file mode 100644
index 0000000..c96d43c
--- /dev/null
+++ b/debian/qtdeclarative5-doc.install
@@ -0,0 +1,3 @@
+usr/share/qt5/doc/qtqml.qch
+usr/share/qt5/doc/qtquick.qch
+usr/share/qt5/doc/qtquickdialogs.qch
diff --git a/debian/rules b/debian/rules
index 5cc2013..b896ac7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,8 @@ 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; do \
+	                       qtopengl qtprintsupport qtsql qttestlib qtwidgets qtxml \
+	                       qml quick quickdialogs; 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; \

-- 
qttools packaging