[Pkg-samba-maint] [samba] 01/01: Pass --parallel to dh rather than to dh_auto_build, which is slightly more correct.

[Steve Langasek]

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

vorlon pushed a commit to branch master
in repository samba.

commit 8602f843fd8e0d8ef1a5b5bce5bfe6a9acdfaf71
Author: Steve Langasek <vorlon at debian.org>
Date:   Thu Aug 8 15:47:42 2013 -0700

    Pass --parallel to dh rather than to dh_auto_build, which is slightly more correct.
---
 debian/changelog |    7 +++++++
 debian/rules     |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 367c635..af54841 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+samba (2:3.6.18-2) UNRELEASED; urgency=low
+
+  * Pass --parallel to dh rather than to dh_auto_build, which is slightly
+    more correct.
+
+ -- Steve Langasek <vorlon at debian.org>  Wed, 21 Aug 2013 12:39:40 -0700
+
 samba (2:3.6.19-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 657b344..4f86d44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ export DH_ALWAYS_EXCLUDE := COPYING:Makefile.internal:history
 DESTDIR=`pwd`/debian/tmp
 
 %:
-	dh $@ --sourcedirectory=source3
+	dh $@ --sourcedirectory=source3 --parallel
 
 conf_args = \
 		--cache-file=./config.cache \
@@ -70,7 +70,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(conf_args)
 
 override_dh_auto_build:
-	dh_auto_build --parallel -- everything nsswitch
+	dh_auto_build -- everything nsswitch
 
 # our test suite requires including a wrapper lib we don't want to ship.
 override_dh_auto_test:

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