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

[David Paleino]

The following commit has been merged in the master branch:
commit e24e2360db4767e4ecad31582ca3a3fb5d01fbc2
Author: David Paleino <dapal at debian.org>
Date:   Sun Feb 21 00:05:26 2010 +0100

    01-generate_local_docs.patch added, tell epydoc to generate docs from local code, don't look for a system-wide module.

diff --git a/debian/changelog b/debian/changelog
index 2de25af..d5b2876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ mapnik (0.7.0-1) UNRELEASED; urgency=low
     - rewritten to use dh7
     - handle multiple Python versions
   * debian/patches/:
+    - 01-generate_local_docs.patch added, tell epydoc to generate
+      docs from local code, don't look for a system-wide module.
     - 02-fix_FTBFS_binutils-gold.patch added (Closes: #555586)
   * debian/copyright, substitute (C) with © to make lintian happy
   * debian/mapnik-doc.doc-base added
@@ -36,7 +38,7 @@ mapnik (0.7.0-1) UNRELEASED; urgency=low
   * debian/compat bumped to 7
   * debian/copyright updated to be DEP-5-compliant
 
- -- David Paleino <dapal at debian.org>  Sat, 20 Feb 2010 18:18:38 +0100
+ -- David Paleino <dapal at debian.org>  Sun, 21 Feb 2010 00:04:41 +0100
 
 mapnik (0.6.1-1) unstable; urgency=low
 
diff --git a/debian/patches/01-generate_local_docs.patch b/debian/patches/01-generate_local_docs.patch
new file mode 100644
index 0000000..aad5274
--- /dev/null
+++ b/debian/patches/01-generate_local_docs.patch
@@ -0,0 +1,20 @@
+From: David Paleino <dapal at debian.org>
+Subject: generate documentation for the locally built module
+Forwarded: no
+
+---
+ docs/epydoc_config/build_epydoc.sh |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- mapnik.orig/docs/epydoc_config/build_epydoc.sh
++++ mapnik/docs/epydoc_config/build_epydoc.sh
+@@ -13,7 +13,8 @@ epydoc --no-private \
+     --no-sourcecode \
+     --name mapnik \
+     --url http://mapnik.org \
+-    --css mapnik_epydoc.css mapnik \
++    --css mapnik_epydoc.css \
++    ../../bindings/python/mapnik \
+     -o $API_DOCS_DIR
+ 
+ exit $?
diff --git a/debian/patches/series b/debian/patches/series
index 1af0a45..29bb7a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01-generate_local_docs.patch
 02-fix_FTBFS_binutils-gold.patch

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