[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-27-gfd85e61

[David Paleino]

The following commit has been merged in the master branch:
commit fd85e6142ad3f5f2e303656d2c2fc56787f9d269
Author: David Paleino <dapal at debian.org>
Date:   Fri Feb 19 23:50:55 2010 +0100

    Changes to support multiple Python versions

diff --git a/debian/changelog b/debian/changelog
index 961dfce..a237613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,10 +18,12 @@ mapnik (0.7.0-1) UNRELEASED; urgency=low
       + bump debhelper version
       + use python-support instead of python-central
       + drop useless dependency on python
+    - support Python >= 2.5
   * debian/watch updated to use new url
   * debian/rules:
     - added quilt infrastructure
     - rewritten to use dh7
+    - handle multiple Python versions
   * debian/patches/:
     - 02-fix_FTBFS_binutils-gold.patch added (Closes: #555586)
   * debian/copyright, substitute (C) with © to make lintian happy
@@ -30,7 +32,7 @@ mapnik (0.7.0-1) UNRELEASED; urgency=low
   * debian/*.1 moved to debian/manpages/
   * debian/compat bumped to 7
 
- -- David Paleino <dapal at debian.org>  Fri, 19 Feb 2010 20:38:25 +0100
+ -- David Paleino <dapal at debian.org>  Fri, 19 Feb 2010 23:50:41 +0100
 
 mapnik (0.6.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9536001..d8d4507 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>,
 Build-Depends:
  python-support (>= 0.90.0~),
  debhelper (>= 7.0.50~),
- python2.5-dev,
+ python-all-dev,
  libboost-thread-dev,
  libboost-filesystem-dev,
  libboost-regex-dev,
@@ -35,7 +35,7 @@ Build-Depends:
  libsigc++-2.0-dev
 Standards-Version: 3.8.4
 Section: libs
-XS-Python-Version: 2.5
+XS-Python-Version: >= 2.5
 Homepage: http://www.mapnik.org/
 Vcs-Git: git://git.debian.org/pkg-grass/mapnik.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapnik.git
diff --git a/debian/rules b/debian/rules
index 41d8f74..b9f7fe5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 # scons flags
-SCONS_FLAGS=INPUT_PLUGINS=raster,sqlite,postgis,ogr,shape,osm,gdal,kismet PROJ_INCLUDES=/usr/include PROJ_LIBS=/usr/lib INTERNAL_LIBAGG=no SYSTEM_FONTS=/usr/share/fonts/truetype/ttf-dejavu PYTHON=/usr/bin/python2.5 XMLPARSER=libxml2 DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr LIB_DIR_NAME=/mapnik/0.7
+SCONS_FLAGS=INPUT_PLUGINS=raster,sqlite,postgis,ogr,shape,osm,gdal,kismet PROJ_INCLUDES=/usr/include PROJ_LIBS=/usr/lib INTERNAL_LIBAGG=no SYSTEM_FONTS=/usr/share/fonts/truetype/ttf-dejavu XMLPARSER=libxml2 DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr LIB_DIR_NAME=/mapnik/0.7
 
 CFLAGS = -Wall -g
 
@@ -16,15 +16,19 @@ else
 endif
 
 override_dh_auto_configure:
-	python scons/scons.py configure $(SCONS_FLAGS) $(CFLAGS)
-	dh_auto_configure
+	@echo Skipping dh_auto_configure, overriding it all in dh_auto_build.
 
 override_dh_auto_build:
-	python scons/scons.py $(SCONS_FLAGS)
+	for py in $(shell pyversions -r); do \
+		$$py scons/scons.py $(SCONS_FLAGS) $(CFLAGS) PYTHON=/usr/bin/$$py configure ; \
+		$$py scons/scons.py $(SCONS_FLAGS) PYTHON=/usr/bin/$$py ; \
+		$$py scons/scons.py $(SCONS_FLAGS) PYTHON=/usr/bin/$$py install ; \
+		dh_auto_build ; \
+		dh_auto_clean ; \
+	done
 	# We don't provide pkg-config files so this Makefile is just confusing
 	# when installed as a demo
 	#rm -f demo/c++/Makefile
-	dh_auto_build
 
 override_dh_auto_clean:
 	python scons/scons.py --clean $(SCONS_FLAGS)
@@ -40,7 +44,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 
 override_dh_auto_install:
-	python scons/scons.py install $(SCONS_FLAGS)
 	find $(CURDIR)/debian/tmp -name '.sconsign' -delete
 	find $(CURDIR)/debian/tmp -wholename 'c++/Makefile' -delete
 	install -m 0755 debian/mapnik-plugin-base $(CURDIR)/debian/tmp/usr/bin

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