[qgis] 07/13: Use dh --parallel instead of make flags.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository qgis.

commit 856990c5ea6396448b685f64f29fa9e07193f06e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 8 05:53:46 2014 +0100

    Use dh --parallel instead of make flags.
---
 debian/changelog | 1 +
 debian/rules     | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ed18f6..424ee06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low
   * Add patch to fix mis-detection of PostGIS table types.
   * Add patch to not look for topology layers without topology support.
   * Add patch to fix postgis topology availability detection query.
+  * Use dh --parallel instead of make flags.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 31 Jan 2014 19:42:03 +0100
 
diff --git a/debian/rules b/debian/rules
index 2303558..e79ed74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,11 +60,6 @@ MAKEFLAGS += VERBOSE=YES
 DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
 CFLAGS   += $(CPPFLAGS)
 CXXFLAGS += $(CPPFLAGS)
 
@@ -83,7 +78,7 @@ ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
 endif
 
 %:
-	dh $@ --with python2,pkgkde_symbolshelper
+	dh $@ --with python2,pkgkde_symbolshelper --parallel
 
 override_dh_clean:
 	dh_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git