[SCM] Qt 4 packaging branch, master, updated. debian/4.7.4-1-2-g583392d

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 583392dfa83f54bdf1de7c5f28f4b2ebf3e0e3ff
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Jan 5 22:36:14 2012 +0200

    Update debian/rules: build documentation in dh_auto_install so it is only
    built when arch-all packages are generated. (Closes: #653427)
---
 debian/changelog |    3 ++-
 debian/rules     |   14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97047d4..bff01ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qt4-x11 (4:4.7.4-2) UNRELEASED; urgency=low
 
-  * .
+  * Update debian/rules: build documentation in dh_auto_install so it is only
+    built when arch-all packages are generated. (Closes: #653427)
 
  -- Fathi Boudra <fabo at debian.org>  Thu, 05 Jan 2012 22:23:02 +0200
 
diff --git a/debian/rules b/debian/rules
index 70c47b7..832b7e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,13 +149,8 @@ endif
 
 override_dh_auto_build:
 	dh_auto_build
-	# Build documentations
-	dh_auto_build -Smakefile -- docs
 	# Build translations
 	dh_auto_build -Smakefile -- ts
-	# 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
@@ -232,6 +227,15 @@ override_dh_auto_clean:
 	rm -f debian/stamp-makefile-build-tools
 
 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