[SCM] qttools packaging branch, experimental, updated. debian/5.2.0-6-4-g24fc846

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 24fc84639bffe6a8d4fac3daaff4f8a204f1f9cd
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jan 19 15:07:51 2014 +0400

    Build qtbase5-doc in this source package.
    
    Based on HTML files from qtbase5-doc-html package.
---
 debian/changelog           |  2 ++
 debian/control             | 12 ++++++++++++
 debian/qtbase5-doc.install | 13 +++++++++++++
 debian/rules               | 15 +++++++++++++++
 4 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 995546e..ba932af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qttools-opensource-src (5.2.0-7) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Correct qttools5-doc-html package description: these are not XML
     tools.
+  * Build qtbase5-doc in this source package, based on HTML files from
+    qtbase5-doc-html package.
 
   [ Sune Vuorela ]
   * Update description of the dev tools package to mention some of the
diff --git a/debian/control b/debian/control
index 3833830..0d8a5bd 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 9),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.2.0+dfsg~),
                zlib1g-dev
+Build-Depends-Indep: qtbase5-doc-html
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qttools.git
@@ -170,6 +171,17 @@ Description: Qt 5 tools examples debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 tools examples.
 
+Package: qtbase5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 base 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 base libraries.
+
 Package: qttools5-doc
 Priority: extra
 Architecture: all
diff --git a/debian/qtbase5-doc.install b/debian/qtbase5-doc.install
new file mode 100644
index 0000000..62815f7
--- /dev/null
+++ b/debian/qtbase5-doc.install
@@ -0,0 +1,13 @@
+usr/share/qt5/doc/qdoc.qch
+usr/share/qt5/doc/qmake.qch
+usr/share/qt5/doc/qtconcurrent.qch
+usr/share/qt5/doc/qtcore.qch
+usr/share/qt5/doc/qtdbus.qch
+usr/share/qt5/doc/qtgui.qch
+usr/share/qt5/doc/qtnetwork.qch
+usr/share/qt5/doc/qtopengl.qch
+usr/share/qt5/doc/qtprintsupport.qch
+usr/share/qt5/doc/qtsql.qch
+usr/share/qt5/doc/qttestlib.qch
+usr/share/qt5/doc/qtwidgets.qch
+usr/share/qt5/doc/qtxml.qch
diff --git a/debian/rules b/debian/rules
index 15adff9..5cc2013 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,10 +44,25 @@ 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 \
+		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; \
+	done
 
 override_dh_install:
 	dh_install --fail-missing
 
+override_dh_installdocs-indep:
+	dh_installdocs -i
+	# We want to use the qtbase copyright in qtbase5-doc
+	rm -v debian/qtbase5-doc/usr/share/doc/qtbase5-doc/copyright
+	cp /usr/share/doc/qtbase5-doc-html/copyright \
+		debian/qtbase5-doc/usr/share/doc/qtbase5-doc/
+	cp /usr/share/doc/qtbase5-doc-html/LGPL_EXCEPTION.txt \
+		debian/qtbase5-doc/usr/share/doc/qtbase5-doc/
+
 override_dh_strip:
 	dh_strip -pqttools5-examples --dbg-package=qttools5-examples-dbg
 	dh_strip --remaining-packages --dbg-package=qttools5-dbg

-- 
qttools packaging