[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-2-2-gb49f295

[David Paleino]

The following commit has been merged in the master branch:
commit b49f295352a04e2b5cf1ef461860ae80c70bebe7
Author: David Paleino <dapal at debian.org>
Date:   Tue Oct 25 21:41:49 2011 +0200

    Fix wrong linkage against boost_python-py2*

diff --git a/debian/changelog b/debian/changelog
index 6402812..1bf7573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapnik (2.0.0+ds1-3) UNRELEASED; urgency=low
+
+  * Fix wrong linkage against boost_python-py2*
+
+ -- David Paleino <dapal at debian.org>  Tue, 25 Oct 2011 09:59:35 +0200
+
 mapnik (2.0.0+ds1-2) unstable; urgency=low
 
   * 03-fix_big-endian.patch added: the variable for big-endian
diff --git a/debian/rules b/debian/rules
index 456a373..f642e07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,19 +21,21 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	set -e; \
-	for py in $(shell pyversions -r); do \
+	for ver in $(shell pyversions -r -v); do \
 		scons $(SCONS_FLAGS) \
-			PYTHON=/usr/bin/$$py ; \
+			BOOST_PYTHON_LIB=boost_python-py$$(echo $$ver | sed 's@\.@@') \
+			PYTHON=/usr/bin/python$$ver ; \
 	done
 
 override_dh_prep:
 	dh_prep -Xdebian/tmp
 
 override_dh_auto_install:
-	for py in $(shell pyversions -r); do \
+	for ver in $(shell pyversions -r -v); do \
 		scons $(SCONS_FLAGS) \
 			CCFLAGS="$(CFLAGS)" \
-			PYTHON=/usr/bin/$$py \
+			BOOST_PYTHON_LIB=boost_python-py$$(echo $$ver | sed 's@\.@@') \
+			PYTHON=/usr/bin/python$$ver \
 			DESTDIR=$(CURDIR)/debian/tmp \
 			install ; \
 	done

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