[Python-modules-commits] [ocr4gamera] 05/06: 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 ocr4gamera.

commit bdcafa068bb400352f519ce622a58ece0b9e69c0
Merge: 6ea7889 3aea66d
Author: Daniel Stender <debian at danielstender.com>
Date:   Sat Oct 17 22:09:04 2015 +0200

    reapplied doc-build-local.diff

 debian/.git-dpm                           |  4 +--
 debian/patches/0001-doc-build-local.patch | 47 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 doc/gendoc.py                             | 13 +++++++++
 4 files changed, 63 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index f159487,0000000..c6385ab
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
- 3c6c653da9a06d870e6824b25b2166ed34f638bd
- 3c6c653da9a06d870e6824b25b2166ed34f638bd
++3aea66dfde8013e2e892295337cd04759c626771
++3aea66dfde8013e2e892295337cd04759c626771
 +3c6c653da9a06d870e6824b25b2166ed34f638bd
 +3c6c653da9a06d870e6824b25b2166ed34f638bd
 +ocr4gamera_1.2.2.orig.tar.gz
 +5744f27b470ed33324b7e8033265170db2e371ff
 +133527
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-doc-build-local.patch
index 0000000,0000000..d1799c7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-doc-build-local.patch
@@@ -1,0 -1,0 +1,47 @@@
++From 3aea66dfde8013e2e892295337cd04759c626771 Mon Sep 17 00:00:00 2001
++From: Jakub Wilk <jwilk at debian.org>
++Date: Sat, 17 Oct 2015 22:08:43 +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, abort if importing the toolkit didn't succeed.
++   Forwarded: not-needed
++---
++ doc/gendoc.py | 13 +++++++++++++
++ 1 file changed, 13 insertions(+)
++
++diff --git a/doc/gendoc.py b/doc/gendoc.py
++index 6d9bd0b..99030ce 100644
++--- a/doc/gendoc.py
+++++ b/doc/gendoc.py
++@@ -1,8 +1,20 @@
++ #!/usr/bin/env python
++ 
+++import os
+++import sys
+++
++ from gamera import gendoc
++ 
++ if __name__ == '__main__':
+++
+++   import gamera.toolkits
+++   gamera.toolkits.__path__[:0] = [os.path.join(
+++      sys.path[0],
+++      os.pardir,
+++      'gamera',
+++      'toolkits'
+++   )]
+++
++    # Step 1:
++    # Import all of the plugins to document.
++    # Be careful not to load the core plugins, or they
++@@ -12,6 +24,7 @@ if __name__ == '__main__':
++    try:
++       from gamera.toolkits.ocr.plugins import bbox_merging_mcmillan
++    except ImportError:
+++      raise
++       print "WARNING:"
++       print "This `ocr` toolkit must be installed before generating"
++       print "the documentation.  For now, the system will skip generating"
diff --cc debian/patches/series
index 0000000,0000000..512720d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-doc-build-local.patch

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