[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-73-g3e1dbee

[Jérémy Lal]

The following commit has been merged in the master branch:
commit b49c7645e7547346f14b544b83a9b6eb9cec5656
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Aug 24 15:37:37 2013 +0200

    dh_install: call epydoc directly instead of working around shell script

diff --git a/debian/rules b/debian/rules
index d104a7a..d960165 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,11 +53,14 @@ override_dh_install:
 
 	# build Python API documentation
 	# and trick epydoc into loading the shlib too
-	-ln -s ../_mapnik2.so bindings/python/mapnik/
-	-( cd utils/epydoc_config ; \
-	LD_LIBRARY_PATH=$(CURDIR)/debian/libmapnik2-2.2/usr/lib/ ./build_epydoc.sh )
-	rm -rf bindings/python/mapnik/_mapnik2.so
-	dh_install -pmapnik-doc docs/api_docs/python /usr/share/doc/mapnik-doc/
+	LD_LIBRARY_PATH=$(CURDIR)/debian/libmapnik2-2.2/usr/lib/ epydoc --no-private \
+    --no-frames \
+    --no-sourcecode \
+    --name mapnik \
+    --url http://mapnik.org \
+    --css $(CURDIR)/utils/epydoc_config/mapnik_epydoc.css \
+    $(CURDIR)/bindings/python/mapnik \
+    -o $(CURDIR)/debian/mapnik-doc/usr/share/doc/mapnik-doc/python
 
 override_dh_auto_clean:
 	scons --clean $(SCONS_FLAGS)

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