[SCM] qtdoc packaging branch, master, updated. f7d9f169c6659bce7259c346b6f6f7fafa206c3d

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit f7d9f169c6659bce7259c346b6f6f7fafa206c3d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jun 6 21:05:03 2013 -0300

    Build the package using the specific doc options.
---
 debian/qt5-doc-html.install |    2 +-
 debian/qt5-doc.install      |    3 +--
 debian/rules                |    6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/qt5-doc-html.install b/debian/qt5-doc-html.install
index 60f85f1..6f1282d 100644
--- a/debian/qt5-doc-html.install
+++ b/debian/qt5-doc-html.install
@@ -1 +1 @@
-doc/qtdoc/* usr/share/qt5/doc/html/
+usr/share/qt5/doc/qtdoc/
diff --git a/debian/qt5-doc.install b/debian/qt5-doc.install
index 64e2743..117db4d 100644
--- a/debian/qt5-doc.install
+++ b/debian/qt5-doc.install
@@ -1,2 +1 @@
-doc/qtdoc.qch usr/share/qt5/doc/qch
-doc/src/images/ usr/share/qt5/doc/src
+usr/share/qt5/doc/qtdoc.qch
diff --git a/debian/rules b/debian/rules
index 2d4e4d8..9047103 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,15 +21,15 @@ override_dh_auto_build:
 	dh_auto_build -Smakefile -- docs
 
 override_dh_auto_install:
+	dh_auto_install -- install_docs
+
 	# Remove bogus exec bits from some data files in mkspecs, docs, examples
 	# and demos
-	find doc/ \
+	find debian/tmp/usr/share/qt5/doc/ \
 		-perm /u+x,g+x,o+x -type f \
 		-regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \
 		-exec chmod a-x {} \;
 
-	dh_auto_install
-
 override_dh_install:
 	dh_install --fail-missing
 

-- 
qtdoc packaging