[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-2-6-gbbeb705

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit bbeb70507aaffe2bde8f216e26795ff286159ef4
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Apr 18 23:53:50 2015 -0300

    Expose documentation in /usr/share/doc
    
    Closes #751084
---
 debian/changelog |  1 +
 debian/rules     | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8192eb0..0e5af6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtbase-opensource-src (5.4.1+dfsg-3) UNRELEASED; urgency=medium
   * Enable parallel building while bootstraping qmake.
   * Add libpcre3-dev as build dependency in order to use the new pcre16 library
     instead of the embedded one.
+  * Expose documentation in /usr/share/doc (Closes: #751084).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 05 Mar 2015 10:26:29 +0300
 
diff --git a/debian/rules b/debian/rules
index 5eecfec..4bd7756 100755
--- a/debian/rules
+++ b/debian/rules
@@ -205,7 +205,8 @@ override_dh_auto_clean:
 	| cut -d ':' -f 1 | xargs rm -f
 
 	# Generated on build
-	rm -f debian/stamp-makefile-build-tools
+	rm -vf debian/stamp-makefile-build-tools
+	rm -vf debian/qtbase5-doc-html.links
 
 	# more leftovers
 	rm -f .device.vars .qmake.vars
@@ -304,6 +305,13 @@ override_dh_install:
 	# and/or .install.OS files.
 	dh_install --fail-missing
 
+	# Expose documentation in /usr/share/doc/<package>/html/
+	rm -vf debian/qtbase5-doc-html.links
+	for submodule in `find debian/qtbase5-doc-html/usr/share/qt5/doc/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \;`; \
+	do \
+	echo usr/share/qt5/doc/$$submodule usr/share/qtbase5-doc-html/html/$$submodule >> debian/qtbase5-doc-html.links; \
+	done
+
 override_dh_installdocs:
 	dh_installdocs --all LGPL_EXCEPTION.txt
 

-- 
qtbase packaging