[SCM] mapnik branch, master, updated. debian/0.7.1-5-25-g8743fac

[David Paleino]

The following commit has been merged in the master branch:
commit 0b6c85f92ed3e862841453725667f3f06c9250e1
Author: David Paleino <dapal at debian.org>
Date:   Tue Oct 4 11:47:28 2011 +0200

    Additional binaries in mapnik-utils

diff --git a/debian/control b/debian/control
index 92b5337..68133d9 100644
--- a/debian/control
+++ b/debian/control
@@ -122,6 +122,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends}
  , ${misc:Depends}
+ , python-mapnik2
+ , python-lxml
 Description: C++/Python toolkit for developing GIS applications (utilities)
  Mapnik is an OpenSource C++/Python toolkit for developing GIS
  (Geographic Information Systems) applications. At the core is a C++
diff --git a/debian/mapnik-utils.install b/debian/mapnik-utils.install
index 24af807..cf5e446 100644
--- a/debian/mapnik-utils.install
+++ b/debian/mapnik-utils.install
@@ -1 +1,3 @@
 usr/bin/shapeindex
+usr/bin/upgrade_map_xml.py
+usr/bin/mapnik-speed-check
diff --git a/debian/rules b/debian/rules
index a205d19..f7d3afe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,9 @@ override_dh_install:
 	dh_install
 	find $(CURDIR)/debian/ -name "modserver.py" | xargs chmod -x
 
+	mv $(CURDIR)/debian/mapnik-utils/usr/bin/upgrade_map_xml.py \
+		$(CURDIR)/debian/mapnik-utils/usr/bin/upgrade-map-xml
+
 	# build Python API documentation
 	# and trick epydoc into loading the shlib too
 	-ln -s ../_mapnik2.so bindings/python/mapnik/

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