[SCM] mapnik branch, master, updated. debian/2.2.0+ds1-2-3-g2a194bb
The following commit has been merged in the master branch: commit 0875a1cf1e2ac1d01242e5b62a5c7aa183de229e Author: Jérémy Lal kapo...@melix.org Date: Wed Oct 2 21:54:22 2013 +0200 Easier to read without line continuation diff --git a/debian/rules b/debian/rules index 9688e55..17d9c7a 100755 --- a/debian/rules +++ b/debian/rules @@ -84,8 +84,7 @@ override_dh_auto_test: # currently nothing %: - dh $@ \ - --with python2 + dh $@ --with python2 get-orig-source: mkdir -p ../tarballs -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.2.0+ds1-2-3-g2a194bb
The following commit has been merged in the master branch: commit ac704768e5767462352b8699ebcb3c51f088a161 Author: Jérémy Lal kapo...@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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.2.0+ds1-2-3-g2a194bb
The following commit has been merged in the master branch: commit 2a194bb96dae13ea182817a3544c02d2450b560f Author: Jérémy Lal kapo...@melix.org Date: Wed Oct 2 21:55:46 2013 +0200 Update changelog, release diff --git a/debian/changelog b/debian/changelog index fa98878..7360279 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mapnik (2.2.0+ds1-3) unstable; urgency=low + + * Honour DEB_BUILD_OPTIONS parallel, defaults to 1. + + -- Jérémy Lal kapo...@melix.org Wed, 02 Oct 2013 21:55:37 +0200 + mapnik (2.2.0+ds1-2) unstable; urgency=low * Build documentation in -indep target. (Closes: #721579) -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
