[SCM] qttools packaging branch, experimental, updated. debian/5.5.1-2-2-gca34dd1

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ca34dd1ca1d8b318d3b1db4a568bdc9fc4f1c8d5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Oct 21 22:29:06 2015 +0300

    Make arch-indep builds possible.
    
    By building qhelpgenerator before attempting to build docs.
---
 debian/changelog | 3 +++
 debian/rules     | 9 ++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48eb1ba..7bdb88f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qttools-opensource-src (5.5.1-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Make arch-indep builds possible, by building qhelpgenerator before
+    attempting to build docs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 21 Oct 2015 22:03:20 +0300
 
diff --git a/debian/rules b/debian/rules
index f7e3b9b..16c7908 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,14 +22,9 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -fv .qmake.cache
 
-override_dh_auto_build-arch:
-	# This override may seem futile, but it helps us make sure that the tools
-	# needed for building the docs are built before calling them.
-	# If there's a better way, do not hesitate to tell us.
-	dh_auto_build
-	make qmake_all
-
 override_dh_auto_build-indep:
+	cd src/assistant; qmake; $(MAKE) sub-qhelpgenerator
+	cd src/assistant/help; qmake
 	dh_auto_build -Smakefile -- docs
 
 override_dh_auto_install-arch:

-- 
qttools packaging