[Pkg-samba-maint] [samba] 01/02: Revert commit to ease merge in samba_4.0 branch

[Ivo De Decker]

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

idd-guest pushed a commit to branch master
in repository samba.

commit bca8ea970306eb1f806de62b65221e2e1167da33
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Tue Oct 15 08:36:02 2013 +0200

    Revert commit to ease merge in samba_4.0 branch
    
    Revert "Pass --parallel to dh rather than to dh_auto_build, which is slightly more correct."
    
    This reverts commit 8602f843fd8e0d8ef1a5b5bce5bfe6a9acdfaf71.
---
 debian/changelog |    7 -------
 debian/rules     |    4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af54841..367c635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-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 4f86d44..657b344 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 --parallel
+	dh $@ --sourcedirectory=source3
 
 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 -- everything nsswitch
+	dh_auto_build --parallel -- 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