[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-5-5-g4e0ee32

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit ae59003c6caabe15e40cec97b822b054d7aecefc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jun 7 21:04:43 2013 -0300

    Build and create a packages for qch and HTML doc formats.
---
 debian/changelog                |    1 +
 debian/control                  |   23 +++++++++++++++++++++++
 debian/qtbase5-doc-html.install |   12 ++++++++++++
 debian/qtbase5-doc.install      |   12 ++++++++++++
 debian/rules                    |    8 +++++++-
 5 files changed, 55 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8be217f..702dab2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtbase-opensource-src (5.0.2+dfsg1-6) UNRELEASED; urgency=low
     - Add the necessary indep build dependencies:
       * qttools5-dev-tools to use qhelpgenerator.
       * libqt5sql5-sqlite to generate qch doc.
+    - Build and create a packages for qch and HTML doc formats.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 04 Jun 2013 14:43:47 -0300
 
diff --git a/debian/control b/debian/control
index 4a63b6d..a1d69c9 100644
--- a/debian/control
+++ b/debian/control
@@ -412,3 +412,26 @@ Description: Qt 5 development defaults package
  using development binaries like qmake. It provides a default
  configuration for qtchooser, but does not prevent alternative Qt
  installations from being used.
+
+Package: qtbase5-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 base libraries.
+
+Package: qtbase5-doc-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 declarative 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 base
+ libraries.
diff --git a/debian/qtbase5-doc-html.install b/debian/qtbase5-doc-html.install
new file mode 100644
index 0000000..1bb6311
--- /dev/null
+++ b/debian/qtbase5-doc-html.install
@@ -0,0 +1,12 @@
+usr/share/qt5/doc/qdoc/
+usr/share/qt5/doc/qtconcurrent/
+usr/share/qt5/doc/qtcore/
+usr/share/qt5/doc/qtdbus/
+usr/share/qt5/doc/qtgui/
+usr/share/qt5/doc/qtnetwork/
+usr/share/qt5/doc/qtopengl/
+usr/share/qt5/doc/qtprintsupport/
+usr/share/qt5/doc/qtsql/
+usr/share/qt5/doc/qttestlib/
+usr/share/qt5/doc/qtwidgets/
+usr/share/qt5/doc/qtxml/
diff --git a/debian/qtbase5-doc.install b/debian/qtbase5-doc.install
new file mode 100644
index 0000000..02dbc6e
--- /dev/null
+++ b/debian/qtbase5-doc.install
@@ -0,0 +1,12 @@
+usr/share/qt5/doc/qdoc.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 fb7a4ff..8a3c29d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,7 +210,10 @@ ifeq ($(vendor),Ubuntu)
 	rm -rf po
 endif
 
-override_dh_auto_install:
+override_dh_auto_build-indep:
+	dh_auto_build -Smakefile -- docs
+
+override_dh_auto_install-arch:
 	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
 
 	# Fix wrong path in pkgconfig files
@@ -246,6 +249,9 @@ override_dh_auto_install:
 		-regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \
 		-exec chmod a-x {} \;
 
+override_dh_auto_install-indep:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+
 override_dh_install:
 	# Now flush all the .install-* files as .install files.
 	set -e; for pkg in $(pkgs_with_common); do \

-- 
qtbase packaging