[Python-modules-commits] r23179 - in packages/sphinx/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Tuesday, December 18, 2012 @ 21:18:04
  Author: jwilk
Revision: 23179

Backport upstream patch for fix compatibility with Docutils 0.10.

Added:
  packages/sphinx/trunk/debian/patches/manpage_writer_docutils_0.10_api.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2012-12-18 20:59:16 UTC (rev 23178)
+++ packages/sphinx/trunk/debian/changelog	2012-12-18 21:18:04 UTC (rev 23179)
@@ -1,3 +1,9 @@
+sphinx (1.1.3+dfsg-7) UNRELEASED; urgency=low
+
+  * Backport upstream patch for fix compatibility with Docutils 0.10.
+
+ -- Jakub Wilk <jwilk at debian.org>  Tue, 18 Dec 2012 22:10:46 +0100
+
 sphinx (1.1.3+dfsg-6) experimental; urgency=low
 
   [ Jakub Wilk ]

Added: packages/sphinx/trunk/debian/patches/manpage_writer_docutils_0.10_api.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/manpage_writer_docutils_0.10_api.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/manpage_writer_docutils_0.10_api.diff	2012-12-18 21:18:04 UTC (rev 23179)
@@ -0,0 +1,31 @@
+Description: port manpage writer to docutils 0.10 API
+Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/ffb145b7884f
+Last-Update: 2012-12-18
+
+--- a/sphinx/writers/manpage.py
++++ b/sphinx/writers/manpage.py
+@@ -72,6 +72,11 @@
+         # since self.append_header() is never called, need to do this here
+         self.body.append(MACRO_DEF)
+ 
++        # Overwrite admonition label translations with our own
++        for label, translation in admonitionlabels.items():
++            self.language.labels[label] = self.deunicode(translation)
++
++
+     # overwritten -- added quotes around all .TH arguments
+     def header(self):
+         tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
+@@ -193,12 +198,6 @@
+     def depart_seealso(self, node):
+         self.depart_admonition(node)
+ 
+-    # overwritten -- use our own label translations
+-    def visit_admonition(self, node, name=None):
+-        if name:
+-            self.body.append('.IP %s\n' %
+-                             self.deunicode(admonitionlabels.get(name, name)))
+-
+     def visit_productionlist(self, node):
+         self.ensure_eol()
+         names = []

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2012-12-18 20:59:16 UTC (rev 23178)
+++ packages/sphinx/trunk/debian/patches/series	2012-12-18 21:18:04 UTC (rev 23179)
@@ -12,3 +12,4 @@
 sort_stopwords.diff
 support_python_3.3.diff
 l10n_fixes.diff
+manpage_writer_docutils_0.10_api.diff