[SCM] qtdoc packaging branch, master, updated. 00b9fa1aac73c82295d3435463feef9143630042

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 00b9fa1aac73c82295d3435463feef9143630042
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 11 12:05:07 2013 -0300

    Use install files to install stuff.
---
 debian/qt5-doc-html.install |    2 +-
 debian/qt5-doc.install      |    4 ++--
 debian/rules                |   12 +++---------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/debian/qt5-doc-html.install b/debian/qt5-doc-html.install
index ac45197..60f85f1 100644
--- a/debian/qt5-doc-html.install
+++ b/debian/qt5-doc-html.install
@@ -1 +1 @@
-usr/share/qt5/doc/html
+doc/qtdoc/* usr/share/qt5/doc/html/
diff --git a/debian/qt5-doc.install b/debian/qt5-doc.install
index e20f220..64e2743 100644
--- a/debian/qt5-doc.install
+++ b/debian/qt5-doc.install
@@ -1,2 +1,2 @@
-usr/share/qt5/doc/qch
-usr/share/qt5/doc/src
+doc/qtdoc.qch usr/share/qt5/doc/qch
+doc/src/images/ usr/share/qt5/doc/src
diff --git a/debian/rules b/debian/rules
index 073a054..60196be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,21 +20,15 @@ override_dh_auto_build:
 	dh_auto_build -Smakefile -- docs
 
 override_dh_auto_install:
-	mkdir -p debian/tmp/usr/share/qt5/doc/qch
-	cp -a doc/qtdoc.qch debian/tmp/usr/share/qt5/doc/qch/
-	mkdir -p debian/tmp/usr/share/qt5/doc/src
-	cp -a doc/src/images debian/tmp/usr/share/qt5/doc/src/
-	mkdir -p debian/tmp/usr/share/qt5/doc/html
-	cp -a doc/qtdoc/* debian/tmp/usr/share/qt5/doc/html/
-	dh_auto_install
-	
 	# Remove bogus exec bits from some data files in mkspecs, docs, examples
 	# and demos
-	find debian/tmp/usr/share/qt5/ \
+	find 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_installdocs:
 	dh_installdocs --all LGPL_EXCEPTION.txt
 

-- 
qtdoc packaging