[Python-apps-commits] r10110 - in packages/s3ql-beta/trunk/debian (4 files)

[nikratio-guest at users.alioth.debian.org]

    Date: Saturday, October 19, 2013 @ 23:30:34
  Author: nikratio-guest
Revision: 10110

Added patch for Sphinx 1.1.3 compatibility.

Added:
  packages/s3ql-beta/trunk/debian/patches/sphinx-1.1.1-compat.diff
Modified:
  packages/s3ql-beta/trunk/debian/changelog
  packages/s3ql-beta/trunk/debian/control
  packages/s3ql-beta/trunk/debian/patches/series

Modified: packages/s3ql-beta/trunk/debian/changelog
===================================================================
--- packages/s3ql-beta/trunk/debian/changelog	2013-10-19 22:03:32 UTC (rev 10109)
+++ packages/s3ql-beta/trunk/debian/changelog	2013-10-19 23:30:34 UTC (rev 10110)
@@ -1,5 +1,6 @@
 s3ql (2.5-1) UNRELEASED; urgency=low
 
+  * Added patch for Sphinx 1.1.3 compatibility.
   * New upstream release.
   * Updated uploader email address.
   * Removed obsolete lintian override.

Modified: packages/s3ql-beta/trunk/debian/control
===================================================================
--- packages/s3ql-beta/trunk/debian/control	2013-10-19 22:03:32 UTC (rev 10109)
+++ packages/s3ql-beta/trunk/debian/control	2013-10-19 23:30:34 UTC (rev 10110)
@@ -12,7 +12,7 @@
                python3-dbg,
                python3-setuptools (>= 0.6.14),
                python3-apsw (>= 3.7.0),
-               python3-sphinx (>= 1.2~b1),
+               python3-sphinx (>= 1.1.3),
                python3-llfuse (>= 0.39),
                python3-crypto,
                python3-pytest (>= 2.3.3),

Modified: packages/s3ql-beta/trunk/debian/patches/series
===================================================================
--- packages/s3ql-beta/trunk/debian/patches/series	2013-10-19 22:03:32 UTC (rev 10109)
+++ packages/s3ql-beta/trunk/debian/patches/series	2013-10-19 23:30:34 UTC (rev 10110)
@@ -1 +1,2 @@
 proc_mount.diff
+sphinx-1.1.1-compat.diff

Added: packages/s3ql-beta/trunk/debian/patches/sphinx-1.1.1-compat.diff
===================================================================
--- packages/s3ql-beta/trunk/debian/patches/sphinx-1.1.1-compat.diff	                        (rev 0)
+++ packages/s3ql-beta/trunk/debian/patches/sphinx-1.1.1-compat.diff	2013-10-19 23:30:34 UTC (rev 10110)
@@ -0,0 +1,78 @@
+Description: Monkeypatch for Sphinx 1.1.3 compatibility
+Origin: debian
+Forwarded: no
+Last-Update: <2013-10-19>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+This patch can be dropped as soon as Sphinx 1.2 (or newer) 
+arrives in unstable. It works around issues
+
+https://bitbucket.org/birkenfeld/sphinx/issue/1281/
+
+and
+
+https://bitbucket.org/birkenfeld/sphinx/issue/1196/
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,9 +18,15 @@
+ except ImportError:
+     raise SystemExit('Setuptools/distribute package not found. Please install from '
+                      'https://pypi.python.org/pypi/distribute')
+-import setuptools.command.test as setuptools_test
+ from setuptools import Extension
+     
++# Work around https://bitbucket.org/birkenfeld/sphinx/issue/1196/
++import locale
++import os
++os.environ['LC_ALL'] = 'C.UTF-8'
++os.environ['LANG'] = 'C.UTF-8'
++locale.setlocale(locale.LC_ALL, '')
++
+ import os
+ import subprocess
+ import logging.handlers
+@@ -66,6 +72,7 @@
+         except ImportError:
+             raise SystemExit('This command requires Sphinx to be installed.') from None
+ 
++        fix_sphinx_issue_1281()
+         fix_docutils()
+         
+         dest_dir = os.path.join(basedir, 'doc')
+@@ -290,6 +297,35 @@
+     
+     assert docutils.parsers.get_parser_class('rst') is rst.Parser
+ 
++def fix_sphinx_issue_1281():
++    '''Monkeypatch for https://bitbucket.org/birkenfeld/sphinx/issue/1281'''
++    
++    import sphinx
++
++    sphinx_ver = tuple(sphinx.__version__.split('.'))
++    if sphinx_ver >= ('1', '2'):
++        return
++    
++    elif sphinx_ver != ('1', '1', '3'):
++        raise SystemExit('Need Sphinx 1.2 or newer')
++
++    from sphinx.writers import manpage
++    from sphinx.locale import admonitionlabels
++
++    try:
++        del manpage.ManualPageTranslator.visit_admonition
++    except AttributeError:
++        pass
++
++    real_init = manpage.ManualPageTranslator.__init__
++
++    def __init__(self, builder, *args, **kwds):
++        real_init(self, builder, *args, **kwds)
++        # Overwrite admonition label translations with our own
++        for label, translation in admonitionlabels.items():
++            self.language.labels[label] = self.deunicode(translation)
++
++    
+     
+ if __name__ == '__main__':
+     main()