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

[David Paleino]

The following commit has been merged in the master branch:
commit 161bc6266badd6f3d0d3b944c6005d79a3b64850
Author: David Paleino <dapal at debian.org>
Date:   Sun Feb 21 09:34:20 2010 +0100

    Try harder to correctly compile the documentation

diff --git a/debian/mapnik-doc.install b/debian/mapnik-doc.install
deleted file mode 100644
index fc16fde..0000000
--- a/debian/mapnik-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-docs/api_docs/python	/usr/share/doc/mapnik-doc/
diff --git a/debian/rules b/debian/rules
index ba8252a..67e8d23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,12 +24,6 @@ override_dh_auto_build:
 		scons $(SCONS_FLAGS) PYTHON=/usr/bin/$$py ; \
 	done
 
-	# build Python API documentation
-	# and trick epydoc into loading the shlib too
-	-ln -s ../_mapnik.so bindings/python/mapnik/
-	( cd docs/epydoc_config ; ./build_epydoc.sh )
-	rm -rf bindings/python/mapnik/_mapnik.so
-
 	dh_auto_build
 
 override_dh_prep:
@@ -39,6 +33,14 @@ override_dh_install:
 	dh_install
 	find $(CURDIR)/debian/ -name "modserver.py" | xargs chmod -x
 
+	# build Python API documentation
+	# and trick epydoc into loading the shlib too
+	-ln -s ../_mapnik.so bindings/python/mapnik/
+	( cd docs/epydoc_config ; \
+	LD_LIBRARY_PATH=$(CURDIR)/debian/libmapnik0.7/usr/lib/ ./build_epydoc.sh )
+	rm -rf bindings/python/mapnik/_mapnik.so
+	dh_install -pmapnik-doc docs/api_docs/python /usr/share/doc/mapnik-doc/
+
 override_dh_auto_clean:
 	scons --clean $(SCONS_FLAGS)
 	find -name '*.pyc' -exec rm -f {} \;

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