[Python-modules-commits] [greekocr4gamera] 09/10: reapplied doc-build-local.diff

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository greekocr4gamera.

commit f9c91a4071212e928f3e925fcf763aebd00823d4
Merge: e884cbd 7598f30
Author: Daniel Stender <debian at danielstender.com>
Date:   Sat Oct 17 20:05:33 2015 +0200

    reapplied doc-build-local.diff

 debian/.git-dpm                           |  4 +--
 debian/patches/0003-doc-build-local.patch | 54 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 doc/gendoc.py                             | 26 +++++++--------
 4 files changed, 68 insertions(+), 17 deletions(-)

diff --cc debian/.git-dpm
index e9ad9c9,0000000..8333f4a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- fc952c2b5b896e3a738b3344b4db4270f0daa32e
- fc952c2b5b896e3a738b3344b4db4270f0daa32e
++7598f30ac99cd8f9e6ab897bca0d5ea6a31171d9
++7598f30ac99cd8f9e6ab897bca0d5ea6a31171d9
 +d9c907896fd6f4b61aadb7188d79fe72e2a55fdb
 +d9c907896fd6f4b61aadb7188d79fe72e2a55fdb
 +greekocr4gamera_1.0.1.orig.tar.gz
 +de9101e62ce3c7e5ef8b9632a7400b3513ef1c53
 +119371
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-doc-build-local.patch
index 0000000,0000000..268b55e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-doc-build-local.patch
@@@ -1,0 -1,0 +1,54 @@@
++From 7598f30ac99cd8f9e6ab897bca0d5ea6a31171d9 Mon Sep 17 00:00:00 2001
++From: Jakub Wilk <jwilk at debian.org>
++Date: Sat, 17 Oct 2015 20:05:11 +0200
++Subject: doc-build-local
++
++   Allow to build documentation from local source. Normally it's only
++   possible to build documentation is the toolkit is installed system-wide.
++   This patch allows the documentation to be built from local source.
++   Also, remove spurious warning.
++   Forwarded: not-needed
++---
++ doc/gendoc.py | 26 +++++++++++---------------
++ 1 file changed, 11 insertions(+), 15 deletions(-)
++
++diff --git a/doc/gendoc.py b/doc/gendoc.py
++index 2ab7d89..6a143f4 100644
++--- a/doc/gendoc.py
+++++ b/doc/gendoc.py
++@@ -1,24 +1,20 @@
++ #!/usr/bin/env python
++ 
+++import os
+++import sys
+++
++ from gamera import gendoc
++ 
++ if __name__ == '__main__':
++-   # Step 1:
++-   # Import all of the plugins to document.
++-   # Be careful not to load the core plugins, or they
++-   # will be documented here, too.
++-   # If the plugins are not already installed, we'll just ignore
++-   # them and generate the narrative documentation.
++-   try:
++-      from gamera.toolkits.greekocr.plugins import clear
++-   except ImportError:
++-      print "WARNING:"
++-      print "This `greekocr` toolkit must be installed before generating"
++-      print "the documentation.  For now, the system will skip generating"
++-      print "documentation for the plugins."
++-      print
++ 
++-   # Step 2:
+++   import gamera.toolkits
+++   gamera.toolkits.__path__[:0] = [os.path.join(
+++      sys.path[0],
+++      os.pardir,
+++      'gamera',
+++      'toolkits'
+++   )]
+++
++    # Generate documentation for this toolkit
++    # This will handle any commandline arguments if necessary
++    gendoc.gendoc(classes=[("gamera.toolkits.greekocr.greekocr",
diff --cc debian/patches/series
index 744e8e0,0000000..89d2607
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-fix-help.patch
 +0002-fsf_address.patch
++0003-doc-build-local.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/greekocr4gamera.git