[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-3-24-g5307603

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 53076038b6ab30556618f4dcce6697076a346c51
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jan 7 13:41:20 2016 +0300

    Re-enable building the documentation.
    
    - Add libqt5sql5-sqlite and qttools5-dev-tools to Build-Depends-Indep.
---
 debian/changelog           |  2 ++
 debian/control             | 35 ++++++++++++++++++++++++-----------
 debian/qtbase5-doc.install | 13 +++++++++++++
 debian/rules               | 14 ++++----------
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 002587e..b949233 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ qtbase-opensource-src (5.6.0~beta+dfsg-4) UNRELEASED; urgency=medium
   * Exclude qdoc documentation from debian/qtbase5-doc-html.install (moved to
     qttools module).
   * Remove qdoc mention from qtbase5-dev-tools package description.
+  * Re-enable building the documentation.
+    - Add libqt5sql5-sqlite and qttools5-dev-tools to Build-Depends-Indep.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 Jan 2016 21:05:06 +0300
 
diff --git a/debian/control b/debian/control
index 51f0bf7..6b1182b 100644
--- a/debian/control
+++ b/debian/control
@@ -63,6 +63,8 @@ Build-Depends: debhelper (>= 9),
                publicsuffix,
                unixodbc-dev,
                zlib1g-dev
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~),
+                     qttools5-dev-tools (>= 5.6.0~)
 Build-Conflicts: libmariadbclient-dev
 Standards-Version: 3.9.6
 Homepage: http://qt-project.org/
@@ -501,14 +503,25 @@ Description: Qt 5 development defaults package
  look at http://pkg-kde.alioth.debian.org/packagingqtstuff.html for
  more information.
 
-#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.
+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: 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.install b/debian/qtbase5-doc.install
new file mode 100644
index 0000000..b7245b2
--- /dev/null
+++ b/debian/qtbase5-doc.install
@@ -0,0 +1,13 @@
+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/qtplatformheaders.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 8654072..407ddd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -214,11 +214,8 @@ ifeq ($(vendor),Ubuntu)
 	rm -rf po
 endif
 
-#override_dh_auto_build-indep:
-#	cd $(CURDIR)/src; ../bin/qmake; make sub-tools
-#	cd $(CURDIR)/src/corelib; ../../bin/qmake
-#	cd $(CURDIR)/src/xml; ../../bin/qmake
-#	dh_auto_build -Smakefile -- html_docs
+override_dh_auto_build-indep:
+	dh_auto_build -- docs
 
 override_dh_auto_build-arch:
 	# Bootstrap corelibs in order to be able to build the helper tools to
@@ -291,11 +288,8 @@ endif
 		-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
-#	# Docs are shipping empty directories, most probably for scripts only present
-#	# when building online-html. See QTBUG-44655.
-#	find $(CURDIR)/debian/tmp/usr/share/qt5/doc/ -type d -empty -delete -print
+override_dh_auto_install-indep:
+	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
 
 override_dh_install:
 	# Now flush all the .install-* files as .install files.

-- 
qtbase packaging