[SCM] mapnik branch, master, updated. debian/2.2.0+ds1-4

[Jérémy Lal]

The following commit has been merged in the master branch:
commit 09d9653dd2761f6df017b13461ebec94ff7b4e9a
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Oct 3 14:26:06 2013 +0200

    Update changelog, release

diff --git a/debian/changelog b/debian/changelog
index 7360279..b5fd8b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapnik (2.2.0+ds1-4) unstable; urgency=low
+
+  * Disable completely parallel builds. It might be responsible
+    for memory exhaustion on s390, mipsel, mips.
+
+ -- Jérémy Lal <kapouer at melix.org>  Thu, 03 Oct 2013 14:24:42 +0200
+
 mapnik (2.2.0+ds1-3) unstable; urgency=low
 
   * Honour DEB_BUILD_OPTIONS parallel, defaults to 1. 

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