r10864 - in /desktop/unstable/glib2.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue May  8 09:44:08 2007
New Revision: 10864

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10864
Log:
* Also honor parallel=n in DEB_BUILD_OPTIONS.

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/rules

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=10864&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Tue May  8 09:44:08 2007
@@ -1,3 +1,9 @@
+glib2.0 (2.12.12-2) UNRELEASED; urgency=low
+
+  * Also honor parallel=n in DEB_BUILD_OPTIONS.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 08 May 2007 11:44:03 +0200
+
 glib2.0 (2.12.12-1) unstable; urgency=low
 
   * Fix description of the -dbg package.

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=10864&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules (original)
+++ desktop/unstable/glib2.0/debian/rules Tue May  8 09:44:08 2007
@@ -13,9 +13,10 @@
 # rules in this debian/rules Makefile can be built concurrently as well as
 # upstream rules in Makefile; all $(MAKE) invocations will inherit this flag,
 # if you recurse into debian/rules ($(MAKE)
-# -f debian/rules in rules), you need to pass a flag to avoid adding "-j2" when
+# -f debian/rules in rules), you need to pass a flag to avoid adding "-jX" when
 # the childs encounters this line
-MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j2 $(DEB_BUILD_OPTIONS_PARALLEL))
+DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)