[SCM] qtbase packaging branch, experimental, updated. debian/5.2.0+dfsg-5-7-gb4d3915

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit b4d39156f94e0bf617907c835e21e761b4259131
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jan 16 21:50:29 2014 +0400

    Re-introduce qtbase5-doc-html package.
---
 debian/changelog                |  1 +
 debian/control                  | 12 ++++++++++++
 debian/qtbase5-doc-html.install | 13 +++++++++++++
 debian/rules                    | 11 ++++++++++-
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 52ee550..e6cb3b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtbase-opensource-src (5.2.0+dfsg-6) UNRELEASED; urgency=medium
   * Build-depend on libxcb-xkb-dev, to get more input languages support.
   * Also, build-depend on libxcb-sync-dev instead of removed libxcb-sync0-dev.
   * Fix misspelled DEB_HOST_ARCH_OS in debian/rules comments.
+  * Re-introduce qtbase5-doc-html package.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Backport fix_crash_stale_pointer_dereferencing.patch to solve a crash
diff --git a/debian/control b/debian/control
index 7ac193f..50663d6 100644
--- a/debian/control
+++ b/debian/control
@@ -417,3 +417,15 @@ 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-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 base 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..b06d958
--- /dev/null
+++ b/debian/qtbase5-doc-html.install
@@ -0,0 +1,13 @@
+usr/share/qt5/doc/qdoc/
+usr/share/qt5/doc/qmake/
+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/rules b/debian/rules
index aed4c40..0f1b270 100755
--- a/debian/rules
+++ b/debian/rules
@@ -197,7 +197,13 @@ ifeq ($(vendor),Ubuntu)
 	rm -rf po
 endif
 
-override_dh_auto_install:
+override_dh_auto_build-indep:
+	cd $(CURDIR)/src; ../bin/qmake; make sub-qdoc
+	cd $(CURDIR)/src/corelib; ../../bin/qmake
+	cd $(CURDIR)/src/xml; ../../bin/qmake
+	dh_auto_build -Smakefile -- html_docs
+
+override_dh_auto_install-arch:
 	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
 
 	# Fix wrong path in pkgconfig files
@@ -237,6 +243,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_html_docs
+
 override_dh_install:
 	# Now flush all the .install-* files as .install files.
 	set -e; for pkg in $(pkgs_with_common); do \

-- 
qtbase packaging