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

[David Paleino]

The following commit has been merged in the master branch:
commit 0c0e4070cf71cfde88c06d0c9b647e7586040c9f
Author: David Paleino <dapal at debian.org>
Date:   Sat Feb 20 20:14:36 2010 +0100

    Enable generation of Python API docs

diff --git a/debian/control b/debian/control
index 70192a4..678646c 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,8 @@ Build-Depends:
  python-cairo-dev,
  libsqlite3-dev,
  libcurl4-gnutls-dev,
- libsigc++-2.0-dev
+ libsigc++-2.0-dev,
+ python-epydoc
 Standards-Version: 3.8.4
 Section: libs
 XS-Python-Version: >= 2.5
diff --git a/debian/mapnik-doc.doc-base b/debian/mapnik-doc.doc-base
index fb590a4..a711eae 100644
--- a/debian/mapnik-doc.doc-base
+++ b/debian/mapnik-doc.doc-base
@@ -4,5 +4,5 @@ Abstract: This manual describes the Python API provided by Mapnik.
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/mapnik-doc/api_docs/python/index.html
-Files: /usr/share/doc/mapnik-doc/api_docs/python/*.html
+Index: /usr/share/doc/mapnik-doc/python/index.html
+Files: /usr/share/doc/mapnik-doc/python/*.html
diff --git a/debian/mapnik-doc.docs b/debian/mapnik-doc.docs
deleted file mode 100644
index 9d39991..0000000
--- a/debian/mapnik-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/api_docs
diff --git a/debian/mapnik-doc.install b/debian/mapnik-doc.install
new file mode 100644
index 0000000..fc16fde
--- /dev/null
+++ b/debian/mapnik-doc.install
@@ -0,0 +1 @@
+docs/api_docs/python	/usr/share/doc/mapnik-doc/
diff --git a/debian/rules b/debian/rules
index 1ba68ce..a40b4be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,10 @@ override_dh_auto_build:
 	for py in $(shell pyversions -r); do \
 		scons $(SCONS_FLAGS) PYTHON=/usr/bin/$$py ; \
 	done
+
+	# build Python API documentation
+	( cd docs/epydoc_config ; ./build_epydoc.sh )
+
 	dh_auto_build
 
 override_dh_prep:
@@ -34,7 +38,8 @@ override_dh_auto_clean:
 	find -name '.sconsign*' -exec rm -f {} \;
 	find -name '*.o' -exec rm -f {} \;
 	rm -rf .sconf_temp config.log bindings/python/mapnik/paths.py \
-		utils/shapeindex/shapeindex config.py config.cache
+		utils/shapeindex/shapeindex config.py config.cache \
+		docs/api_docs/python/*
 
 	# Lintian fix
 	chmod -x demo/viewer/images/*.png bindings/python/mapnik/ogcserver/modserver.py

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