[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-37-g829510c

[Didier Raboud]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=669a69e

The following commit has been merged in the experimental branch:
commit 669a69e755d12abe7a98d7cbbfdc5d5dac95b203
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Wed Apr 4 19:57:47 2012 +0200

    Build the documentation in the dh_auto_build target instead of dh_auto_install.
    
    This is possible now that dpkg-buildpackage calls build-arch when building only
    architecture dependent packages.
    
    Reviewed-by: Didier Raboud <odyx at debian.org>
---
 debian/changelog |    2 ++
 debian/rules     |   17 ++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a382764..4c92380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
   * Drop the libqt4-phonon package and build with -no-phonon.
     It's not needed anymore as QtWebKit is built from an own source package and
     no longer uses phonon anyway.
+  * Build the documentation in the dh_auto_build-indep target instead of
+    dh_auto_install.
 
   [ Didier Raboud ]
   * Merge the 4:4.7.4-3 unstable release: drop fix-format.diff, merged
diff --git a/debian/rules b/debian/rules
index bc91c6a..ea00483 100755
--- a/debian/rules
+++ b/debian/rules
@@ -166,8 +166,16 @@ endif
 
 override_dh_auto_build:
 	dh_auto_build
+	# Build documentations
+ifneq (,$(filter qt4-doc, $(shell dh_listpackages)))
+	# Build documentations
+	dh_auto_build -Smakefile -- docs
+endif
 	# Build translations
 	dh_auto_build -Smakefile -- -C translations ts-all
+	# Workaround: It's a known qmake limitation.
+	# It can't generate install rules for files that don't exist yet like docs.
+	./config.status
 
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) confclean distclean
@@ -248,15 +256,6 @@ ifeq ($(vendor),Ubuntu)
 endif
 
 override_dh_auto_install:
-ifneq (,$(filter qt4-doc, $(shell dh_listpackages)))
-	# Build documentations
-	dh_auto_build -Smakefile -- docs
-endif
-
-	# Workaround: It's a known qmake limitation.
-	# It can't generate install rules for files that don't exist yet like docs.
-	./config.status
-
 	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
 
 	# Ship private headers - ugly hack to build Qt Creator QML Designer

-- 
Qt 4 packaging