[SCM] qttools packaging branch, experimental, updated. debian/5.6.0-beta-1-3-g42db95c

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 42db95c9f43afe4b4ce23fafa891195178a66f2e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jan 7 13:52:01 2016 +0300

    Use dh_auto_build instead of plain make to parallelize the build.
---
 debian/changelog |  1 +
 debian/rules     | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3ffdf6..ee6abde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qttools-opensource-src (5.6.0~beta-2) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Add empty override_dh_auto_test-indep target (to prevent the whole qttools
     source from being compiled during indep builds).
+  * Use dh_auto_build instead of plain make to parallelize the build.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Jan 2016 13:46:45 +0300
 
diff --git a/debian/rules b/debian/rules
index 02f7f24..ee8c90e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,11 +23,13 @@ override_dh_auto_clean:
 	rm -fv .qmake.cache
 
 override_dh_auto_build-indep:
-	cd src; qmake; $(MAKE) sub-qdoc
-	cd src/assistant; qmake; $(MAKE) sub-qhelpgenerator
+	cd src; qmake
+	dh_auto_build -- -Csrc sub-qdoc
+	cd src/assistant; qmake
+	dh_auto_build -- -Csrc/assistant sub-qhelpgenerator
 	cd src/qdoc; qmake
 	cd src/assistant/help; qmake
-	dh_auto_build -Smakefile -- docs
+	dh_auto_build -- docs
 
 override_dh_auto_install-arch:
 	dh_auto_install
@@ -43,7 +45,7 @@ override_dh_auto_install-arch:
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
 
 override_dh_auto_install-indep:
-	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qttools packaging