[SCM] qtdeclarative packaging branch, master, updated. debian/5.0.2-4-12-gfc8a64d

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit fc8a64d6f4486c6b34c2d86694720040c68313cd
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jun 7 12:41:30 2013 -0300

    Build the documentation as a Build-Indep task.
    
    We avoid wasting buildd's time.
    
    This approach could help us to bootstrap qtbase and qttool's doc.
---
 debian/changelog |    4 ++--
 debian/control   |    6 +++---
 debian/rules     |   15 ++++++++-------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index adf9421..339dea8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,8 @@ qtdeclarative-opensource-src (5.0.2-5) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Make every package that ships a binary managed by qtchooser depend on it.
-  * Build the documentation shipped with this submodule.
-    - Add the necessary build dependencies:
+  * Build the documentation shipped with this submodule as a build-indep task:
+    - Add the necessary indep build dependencies:
       * qttools5-dev-tools to use qhelpgenerator.
       * libqt5sql5-sqlite to generate qch doc.
     - Build and create a packages for qch and HTML doc formats.
diff --git a/debian/control b/debian/control
index 31fcffd..8a458a7 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 9),
                libqt5v8-5-private-dev (>= 5.0.2~),
                libqt5xmlpatterns5-private-dev (>= 5.0.2~),
                pkg-kde-tools,
-               qtbase5-private-dev (>= 5.0.2~),
-               qttools5-dev-tools (>= 5.0.2~),
-               libqt5sql5-sqlite
+               qtbase5-private-dev (>= 5.0.2~)
+Build-Depends-Indep: libqt5sql5-sqlite,
+                     qttools5-dev-tools (>= 5.0.2~)
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git
diff --git a/debian/rules b/debian/rules
index ede4d7d..95005b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,18 +14,19 @@ export QT_SELECT := qt5
 override_dh_auto_configure:
 	qmake
 
-override_dh_auto_build:
-	dh_auto_build
-	# Build docs
+override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
-override_dh_auto_install:
-	dh_auto_install -- install_docs
+override_dh_auto_install-arch:
+	dh_auto_install
 
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
 
+	# Remove libtool-like files
+	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+
 	# Fix wrong permissions in examples.
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ -type f \( \
 	-name '*.png' \
@@ -36,8 +37,8 @@ override_dh_auto_install:
 	-o -name '*.jpg' \
 	\) -print0 | xargs -0 chmod a-x
 
-	# Remove libtool-like files
-	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+override_dh_auto_install-indep:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qtdeclarative packaging