[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:42:42 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit b9fd9e4fe7f198963cc57f67b3abf31bf07660a4
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Dec 5 04:17:03 2010 +0200

    Use dh_auto_* wrappers in place of $(MAKE) within debian/rules.
    
    This is needed to get automatic handling of parallel building settings for
    these additional make calls.
---
 debian/changelog |    2 ++
 debian/rules     |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7204d38..9aa6079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ qt4-x11 (4:4.7.1-0r1) UNRELEASED; urgency=low
     mkspecs, docs, examples and demos subdirs. Remove those -x bits when files
     are installed to debian/tmp.
   * Fix formatting error in the qmake-qt4.1 manpage at line 83.
+  * Use dh_auto_* wrappers in place of $(MAKE) within debian/rules in order to
+    get automatic handling of parallel building settings for these calls.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 14:55:15 +0200
 
diff --git a/debian/rules b/debian/rules
index 98379a2..146e4a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,9 +129,9 @@ endif
 override_dh_auto_build:
 	dh_auto_build
 	# Build documentations
-	$(MAKE) docs
+	dh_auto_build -Smakefile -- docs
 	# Build translations
-	$(MAKE) ts
+	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
@@ -207,7 +207,7 @@ override_dh_auto_clean:
 	rm -f debian/stamp-makefile-build-tools
 
 override_dh_auto_install:
-	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp/
+	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
 
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/pkgconfig -type f -name '*.pc' \

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list