[SCM] mapnik branch, master, updated. debian/2.2.0+ds1-2-3-g2a194bb

[Jérémy Lal]

The following commit has been merged in the master branch:
commit ac704768e5767462352b8699ebcb3c51f088a161
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Oct 2 21:54:43 2013 +0200

    Honour DEB_BUILD_OPTIONS parallel

diff --git a/debian/rules b/debian/rules
index 17d9c7a..cc56087 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,14 @@ endif
 
 TARNAME := mapnik_$(UPVER)+ds1.orig.tar
 
+NJOBS := -j1
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+NJOBS := -j$(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+endif
+
 # scons flags
-SCONS_FLAGS := INPUT_PLUGINS=csv,gdal,geojson,ogr,osm,postgis,python,raster,rasterlite,shape,sqlite
+SCONS_FLAGS := $(NJOBS)
+SCONS_FLAGS += INPUT_PLUGINS=csv,gdal,geojson,ogr,osm,postgis,python,raster,rasterlite,shape,sqlite
 SCONS_FLAGS += PROJ_INCLUDES=/usr/include PROJ_LIBS=/usr/lib
 SCONS_FLAGS += SYSTEM_FONTS=/usr/share/fonts
 SCONS_FLAGS += XMLPARSER=libxml2

-- 
C++/Python toolkit for developing GIS applications