[SCM] qttools packaging branch, master, updated. debian/5.0.2-6-4-g4516992

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 4516992cfbc2a023906576590f5b75da14567f07
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jun 7 22:34:06 2013 -0300

    Build and create packages for qch and HTML doc formats.
---
 debian/changelog |    1 +
 debian/control   |   24 ++++++++++++++++++++++++
 debian/rules     |   14 +++++++++++++-
 3 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 549dc7e..6c63e9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qttools-opensource-src (5.0.2-7) UNRELEASED; urgency=low
     - Add the necessary indep build dependencies:
       * qttools5-dev-tools to use qhelpgenerator.
       * libqt5sql5-sqlite to generate qch doc.
+    - Build and create packages for qch and HTML doc formats.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 23 May 2013 21:33:23 -0300
 
diff --git a/debian/control b/debian/control
index b5ae1a8..528a6dd 100644
--- a/debian/control
+++ b/debian/control
@@ -169,3 +169,27 @@ Description: Qt 5 tools examples debugging symbols
  is its rich set of widgets that provide standard GUI functionality.
  .
  This package contains the debugging symbols for the Qt 5 tools examples.
+
+Package: qttools5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 tools 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 tools libraries
+ and binaries.
+
+Package: qttools5-doc-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 tools HTML 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 HTML documentation for the Qt 5 XML tools
+ libraries and binaries.
diff --git a/debian/rules b/debian/rules
index abfceb6..611b450 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,16 @@ export QT_SELECT := qt5
 override_dh_auto_configure:
 	qmake 
 
-override_dh_auto_install:
+override_dh_auto_build-arch:
+	# This override may seem futile, but it helps us make sure that the tools
+	# needed for building the docs are built before calling them.
+	# If there's a better way, do not heasitate to tell us.
+	dh_auto_build
+
+override_dh_auto_build-indep:
+	dh_auto_build -Smakefile -- docs
+
+override_dh_auto_install-arch:
 	dh_auto_install
 	
 	# Remove libtool-like files
@@ -28,6 +37,9 @@ override_dh_auto_install:
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
 
+override_dh_auto_install-indep:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+
 override_dh_install:
 	dh_install --fail-missing
 

-- 
qttools packaging