[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 fdb50757822845efebd66847e3b7b509a7678a3f
Author: David Paleino <dapal at debian.org>
Date:   Sat Feb 20 15:38:49 2010 +0100

    Improve overriden targets

diff --git a/debian/rules b/debian/rules
index f49fdbe..99d506d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,22 +16,18 @@ else
 endif
 
 override_dh_auto_configure:
-	@echo Skipping dh_auto_configure, overriding it all in dh_auto_build.
+	python scons/scons.py $(SCONS_FLAGS) $(CFLAGS) configure
+	dh_auto_configure
 
 override_dh_auto_build:
 	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 ; \
-		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 ; \
-		rm -rf config.py config.cache bindings/python/mapnik/paths.py ; \
-		dh_auto_build ; \
 	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_install:
+	install -m 0755 debian/mapnik-plugin-base $(CURDIR)/debian/tmp/usr/bin
+	dh_auto_install
 
 override_dh_auto_clean:
 	python scons/scons.py --clean $(SCONS_FLAGS)

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