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

[David Paleino]

The following commit has been merged in the master branch:
commit 5496f570e8cd446f8cba080f1e91335e1a12a94a
Author: David Paleino <dapal at debian.org>
Date:   Sat Feb 20 15:57:19 2010 +0100

    added scons build-dependency, don't use the embedded one

diff --git a/debian/changelog b/debian/changelog
index 27994cf..e40e16d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ mapnik (0.7.0-1) UNRELEASED; urgency=low
       + bump debhelper version
       + use python-support instead of python-central
       + drop useless dependency on python
+      + added scons build-dependency, don't use the embedded one
     - support Python >= 2.5
     - libmapnik0.6 → libmapnik0.7 because of SONAME bump
   * debian/watch updated to use new url
@@ -33,7 +34,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 23:58:55 +0100
+ -- David Paleino <dapal at debian.org>  Sat, 20 Feb 2010 15:55:42 +0100
 
 mapnik (0.6.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7db285b..97056ab 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>,
  David Paleino <dapal at debian.org>
 Build-Depends:
+ scons,
  python-support (>= 0.90.0~),
  debhelper (>= 7.0.50~),
  python-all-dev,
diff --git a/debian/rules b/debian/rules
index 99d506d..51b1477 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,12 @@ else
 endif
 
 override_dh_auto_configure:
-	python scons/scons.py $(SCONS_FLAGS) $(CFLAGS) configure
+	scons $(SCONS_FLAGS) $(CFLAGS) configure
 	dh_auto_configure
 
 override_dh_auto_build:
 	for py in $(shell pyversions -r); do \
-		$$py scons/scons.py $(SCONS_FLAGS) PYTHON=/usr/bin/$$py ; \
+		scons $(SCONS_FLAGS) PYTHON=/usr/bin/$$py ; \
 	done
 	dh_auto_build
 
@@ -30,7 +30,7 @@ override_dh_auto_install:
 	dh_auto_install
 
 override_dh_auto_clean:
-	python scons/scons.py --clean $(SCONS_FLAGS)
+	scons --clean $(SCONS_FLAGS)
 	find -name '*.pyc' -exec rm -f {} \;
 	find -name '.sconsign*' -exec rm -f {} \;
 	find -name '*.o' -exec rm -f {} \;

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