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

[David Paleino]

The following commit has been merged in the master branch:
commit f960710f5bd72080ad12e4a871dfa4e9e9b6fd7d
Author: David Paleino <dapal at debian.org>
Date:   Sat Feb 20 10:40:03 2010 +0100

    Put remaining install actions inside the overriden loop

diff --git a/debian/rules b/debian/rules
index cbeb420..4f04ce9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,9 @@ override_dh_auto_build:
 		$$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 ; \
 		dh_auto_build ; \
 		dh_auto_clean ; \
 	done
@@ -43,11 +46,6 @@ override_dh_auto_clean:
 
 	dh_auto_clean
 
-override_dh_auto_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
-
 override_dh_installexamples:
 	dh_installexamples -Xdata/new
 

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