[SCM] Debian GNU Mach packaging branch, master, updated. debian/2%1.3.99.dfsg.git20111010-1-58-g3c6db92

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 3c6db9230155bf7b94d7a61190ca0f7362ac8047
Author: Samuel Thibault <address@hidden>
Date:   Sun Feb 19 01:49:43 2012 +0000

    Don't use cdbs, it makes use enable ssp, which we don't want for gnumach

diff --git a/debian/control b/debian/control
index 437826d..00d798c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: 
http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html
 Vcs-Browser: http://git.debian.org/?p=pkg-hurd/gnumach.git
 Vcs-Git: git://git.debian.org/pkg-hurd/gnumach.git
 Build-Depends: debhelper (>= 7), mig, sharutils,
- autoconf, automake, cdbs
+ autoconf, automake
 Standards-Version: 3.9.2
 
 Package: gnumach
diff --git a/debian/rules b/debian/rules
index c6df7cf..193adc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,9 @@ else
        CFLAGS += -O2
 endif
 
-include /usr/share/cdbs/1/class/langcore.mk
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
 
 ifneq (,$(DEB_PARALLEL_JOBS))
 MAKEFLAGS += -j$(DEB_PARALLEL_JOBS)

-- 
Debian GNU Mach packaging