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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit d3b7a58e21fde93dbf95bd700a13425bdf0f5730
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Apr 19 13:54:45 2015 -0300

    Better just link the full Qt5 doc
    
    The rationale behind this is:
    - qtbase ships a lot of submodules, and none of them provides a central
      index.html
    - Qt developers normally use Qt-provided tools for looking at the
      documentation.
    - The real full documentation is provided by qt5-doc-html, the rest are just
      necessary parts of the packaging needed to provide the doc.
    - qt5-doc-html is really the starting point of the whole Qt5 doc
    - qt5-doc-html provides an entry for doc-base
    
    So it's better to point to expose the full installed doc.
---
 debian/qtbase5-doc-html.links | 1 +
 debian/rules                  | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/debian/qtbase5-doc-html.links b/debian/qtbase5-doc-html.links
new file mode 100644
index 0000000..7a5aa91
--- /dev/null
+++ b/debian/qtbase5-doc-html.links
@@ -0,0 +1 @@
+usr/share/qt5/doc usr/share/qtbase5-doc-html/html
diff --git a/debian/rules b/debian/rules
index 4bd7756..9c01027 100755
--- a/debian/rules
+++ b/debian/rules
@@ -206,7 +206,6 @@ override_dh_auto_clean:
 
 	# Generated on build
 	rm -vf debian/stamp-makefile-build-tools
-	rm -vf debian/qtbase5-doc-html.links
 
 	# more leftovers
 	rm -f .device.vars .qmake.vars
@@ -305,13 +304,6 @@ 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