Merge lp:~mitya57/ubuntu/raring/sphinx/fix-ftbfs into lp:ubuntu/raring/sphinx

[Dmitry Shachnev]

[lp:~mitya57/ubuntu/raring/sphinx/fix-ftbfs]

38. By Dmitry Shachnev on 2012-10-23

Build-depend on python3-all instead of python3.

39. By Dmitry Shachnev on 2012-11-01

* debian/patches/support_python_3.3:
  Fix various testsuite failures with Python 3.3 (LP: #1070336).
* Update Homepage field.

40. By Dmitry Shachnev on 2012-11-01

Fix patch format.

41. By Dmitry Shachnev on 2012-11-01

No-change merge from lp:ubuntu/sphinx.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-10-22 20:20:35 +0000
+++ .pc/applied-patches	2012-11-01 17:56:20 +0000
@@ -8,4 +8,3 @@
 fix_nepali_po.diff
 pygments_byte_strings.diff
 fix_shorthandoff.diff
-fix_manpages_generation_with_new_docutils.diff

=== removed directory '.pc/fix_manpages_generation_with_new_docutils.diff'
=== removed directory '.pc/fix_manpages_generation_with_new_docutils.diff/sphinx'
=== removed directory '.pc/fix_manpages_generation_with_new_docutils.diff/sphinx/writers'
=== removed file '.pc/fix_manpages_generation_with_new_docutils.diff/sphinx/writers/manpage.py'
--- .pc/fix_manpages_generation_with_new_docutils.diff/sphinx/writers/manpage.py	2012-10-22 20:20:35 +0000
+++ .pc/fix_manpages_generation_with_new_docutils.diff/sphinx/writers/manpage.py	1970-01-01 00:00:00 +0000
@@ -1,345 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    sphinx.writers.manpage
-    ~~~~~~~~~~~~~~~~~~~~~~
-
-    Manual page writer, extended for Sphinx custom nodes.
-
-    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-from docutils import nodes
-try:
-    from docutils.writers.manpage import MACRO_DEF, Writer, \
-         Translator as BaseTranslator
-    has_manpage_writer = True
-except ImportError:
-    # define the classes in any case, sphinx.application needs it
-    Writer = BaseTranslator = object
-    has_manpage_writer = False
-
-from sphinx import addnodes
-from sphinx.locale import admonitionlabels, versionlabels, _
-from sphinx.util.osutil import ustrftime
-
-
-class ManualPageWriter(Writer):
-    def __init__(self, builder):
-        Writer.__init__(self)
-        self.builder = builder
-
-    def translate(self):
-        visitor = ManualPageTranslator(self.builder, self.document)
-        self.visitor = visitor
-        self.document.walkabout(visitor)
-        self.output = visitor.astext()
-
-
-class ManualPageTranslator(BaseTranslator):
-    """
-    Custom translator.
-    """
-
-    def __init__(self, builder, *args, **kwds):
-        BaseTranslator.__init__(self, *args, **kwds)
-        self.builder = builder
-
-        self.in_productionlist = 0
-
-        # first title is the manpage title
-        self.section_level = -1
-
-        # docinfo set by man_pages config value
-        self._docinfo['title'] = self.document.settings.title
-        self._docinfo['subtitle'] = self.document.settings.subtitle
-        if self.document.settings.authors:
-            # don't set it if no author given
-            self._docinfo['author'] = self.document.settings.authors
-        self._docinfo['manual_section'] = self.document.settings.section
-
-        # docinfo set by other config values
-        self._docinfo['title_upper'] = self._docinfo['title'].upper()
-        if builder.config.today:
-            self._docinfo['date'] = builder.config.today
-        else:
-            self._docinfo['date'] = ustrftime(builder.config.today_fmt
-                                              or _('%B %d, %Y'))
-        self._docinfo['copyright'] = builder.config.copyright
-        self._docinfo['version'] = builder.config.version
-        self._docinfo['manual_group'] = builder.config.project
-
-        # since self.append_header() is never called, need to do this here
-        self.body.append(MACRO_DEF)
-
-    # overwritten -- added quotes around all .TH arguments
-    def header(self):
-        tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
-                " \"%(date)s\" \"%(version)s\" \"%(manual_group)s\"\n"
-                ".SH NAME\n"
-                "%(title)s \- %(subtitle)s\n")
-        return tmpl % self._docinfo
-
-    def visit_start_of_file(self, node):
-        pass
-    def depart_start_of_file(self, node):
-        pass
-
-    def visit_desc(self, node):
-        self.visit_definition_list(node)
-    def depart_desc(self, node):
-        self.depart_definition_list(node)
-
-    def visit_desc_signature(self, node):
-        self.visit_definition_list_item(node)
-        self.visit_term(node)
-    def depart_desc_signature(self, node):
-        self.depart_term(node)
-
-    def visit_desc_addname(self, node):
-        pass
-    def depart_desc_addname(self, node):
-        pass
-
-    def visit_desc_type(self, node):
-        pass
-    def depart_desc_type(self, node):
-        pass
-
-    def visit_desc_returns(self, node):
-        self.body.append(' -> ')
-    def depart_desc_returns(self, node):
-        pass
-
-    def visit_desc_name(self, node):
-        pass
-    def depart_desc_name(self, node):
-        pass
-
-    def visit_desc_parameterlist(self, node):
-        self.body.append('(')
-        self.first_param = 1
-    def depart_desc_parameterlist(self, node):
-        self.body.append(')')
-
-    def visit_desc_parameter(self, node):
-        if not self.first_param:
-            self.body.append(', ')
-        else:
-            self.first_param = 0
-    def depart_desc_parameter(self, node):
-        pass
-
-    def visit_desc_optional(self, node):
-        self.body.append('[')
-    def depart_desc_optional(self, node):
-        self.body.append(']')
-
-    def visit_desc_annotation(self, node):
-        pass
-    def depart_desc_annotation(self, node):
-        pass
-
-    def visit_desc_content(self, node):
-        self.visit_definition(node)
-    def depart_desc_content(self, node):
-        self.depart_definition(node)
-
-    def visit_refcount(self, node):
-        self.body.append(self.defs['emphasis'][0])
-    def depart_refcount(self, node):
-        self.body.append(self.defs['emphasis'][1])
-
-    def visit_versionmodified(self, node):
-        self.visit_paragraph(node)
-        text = versionlabels[node['type']] % node['version']
-        if len(node):
-            text += ': '
-        else:
-            text += '.'
-        self.body.append(text)
-    def depart_versionmodified(self, node):
-        self.depart_paragraph(node)
-
-    def visit_termsep(self, node):
-        self.body.append(', ')
-        raise nodes.SkipNode
-
-    # overwritten -- we don't want source comments to show up
-    def visit_comment(self, node):
-        raise nodes.SkipNode
-
-    # overwritten -- added ensure_eol()
-    def visit_footnote(self, node):
-        self.ensure_eol()
-        BaseTranslator.visit_footnote(self, node)
-
-    # overwritten -- handle footnotes rubric
-    def visit_rubric(self, node):
-        self.ensure_eol()
-        if len(node.children) == 1:
-            rubtitle = node.children[0].astext()
-            if rubtitle in ('Footnotes', _('Footnotes')):
-                self.body.append('.SH ' + self.deunicode(rubtitle).upper() +
-                                 '\n')
-                raise nodes.SkipNode
-        else:
-            self.body.append('.sp\n')
-    def depart_rubric(self, node):
-        pass
-
-    def visit_seealso(self, node):
-        self.visit_admonition(node)
-    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 = []
-        self.in_productionlist += 1
-        self.body.append('.sp\n.nf\n')
-        for production in node:
-            names.append(production['tokenname'])
-        maxlen = max(len(name) for name in names)
-        for production in node:
-            if production['tokenname']:
-                lastname = production['tokenname'].ljust(maxlen)
-                self.body.append(self.defs['strong'][0])
-                self.body.append(self.deunicode(lastname))
-                self.body.append(self.defs['strong'][1])
-                self.body.append(' ::= ')
-            else:
-                self.body.append('%s     ' % (' '*len(lastname)))
-            production.walkabout(self)
-            self.body.append('\n')
-        self.body.append('\n.fi\n')
-        self.in_productionlist -= 1
-        raise nodes.SkipNode
-
-    def visit_production(self, node):
-        pass
-    def depart_production(self, node):
-        pass
-
-    # overwritten -- don't emit a warning for images
-    def visit_image(self, node):
-        if 'alt' in node.attributes:
-            self.body.append(_('[image: %s]') % node['alt'] + '\n')
-        self.body.append(_('[image]') + '\n')
-        raise nodes.SkipNode
-
-    # overwritten -- don't visit inner marked up nodes
-    def visit_reference(self, node):
-        self.body.append(self.defs['reference'][0])
-        self.body.append(node.astext())
-        self.body.append(self.defs['reference'][1])
-
-        uri = node.get('refuri', '')
-        if uri.startswith('mailto:') or uri.startswith('http:') or \
-                 uri.startswith('https:') or uri.startswith('ftp:'):
-            # if configured, put the URL after the link
-            if self.builder.config.man_show_urls and \
-                   node.astext() != uri:
-                if uri.startswith('mailto:'):
-                    uri = uri[7:]
-                self.body.extend([
-                    ' <',
-                    self.defs['strong'][0], uri, self.defs['strong'][1],
-                    '>'])
-        raise nodes.SkipNode
-
-    def visit_centered(self, node):
-        self.ensure_eol()
-        self.body.append('.sp\n.ce\n')
-    def depart_centered(self, node):
-        self.body.append('\n.ce 0\n')
-
-    def visit_compact_paragraph(self, node):
-        pass
-    def depart_compact_paragraph(self, node):
-        pass
-
-    def visit_highlightlang(self, node):
-        pass
-    def depart_highlightlang(self, node):
-        pass
-
-    def visit_download_reference(self, node):
-        pass
-    def depart_download_reference(self, node):
-        pass
-
-    def visit_toctree(self, node):
-        raise nodes.SkipNode
-
-    def visit_index(self, node):
-        raise nodes.SkipNode
-
-    def visit_tabular_col_spec(self, node):
-        raise nodes.SkipNode
-
-    def visit_glossary(self, node):
-        pass
-    def depart_glossary(self, node):
-        pass
-
-    def visit_acks(self, node):
-        self.ensure_eol()
-        self.body.append(', '.join(n.astext()
-                                   for n in node.children[0].children) + '.')
-        self.body.append('\n')
-        raise nodes.SkipNode
-
-    def visit_hlist(self, node):
-        self.visit_bullet_list(node)
-    def depart_hlist(self, node):
-        self.depart_bullet_list(node)
-
-    def visit_hlistcol(self, node):
-        pass
-    def depart_hlistcol(self, node):
-        pass
-
-    def visit_literal_emphasis(self, node):
-        return self.visit_emphasis(node)
-    def depart_literal_emphasis(self, node):
-        return self.depart_emphasis(node)
-
-    def visit_abbreviation(self, node):
-        pass
-    def depart_abbreviation(self, node):
-        pass
-
-    # overwritten: handle section titles better than in 0.6 release
-    def visit_title(self, node):
-        if isinstance(node.parent, addnodes.seealso):
-            self.body.append('.IP "')
-            return
-        elif isinstance(node.parent, nodes.section):
-            if self.section_level == 0:
-                # skip the document title
-                raise nodes.SkipNode
-            elif self.section_level == 1:
-                self.body.append('.SH %s\n' %
-                                 self.deunicode(node.astext().upper()))
-                raise nodes.SkipNode
-        return BaseTranslator.visit_title(self, node)
-    def depart_title(self, node):
-        if isinstance(node.parent, addnodes.seealso):
-            self.body.append('"\n')
-            return
-        return BaseTranslator.depart_title(self, node)
-
-    def visit_raw(self, node):
-        if 'manpage' in node.get('format', '').split():
-            self.body.append(node.astext())
-        raise nodes.SkipNode
-
-    def unknown_visit(self, node):
-        raise NotImplementedError('Unknown node: ' + node.__class__.__name__)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-22 20:20:35 +0000
+++ debian/changelog	2012-11-01 17:56:20 +0000
@@ -1,3 +1,12 @@
+sphinx (1.1.3+dfsg-4ubuntu5) raring; urgency=low
+
+  * Build-depend on python3-all instead of python3.
+  * debian/patches/support_python_3.3:
+    Fix various testsuite failures with Python 3.3 (LP: #1070336).
+  * Update Homepage field.
+
+ -- Dmitry Shachnev <[e-mail]>  Thu, 01 Nov 2012 21:39:16 +0400
+
 sphinx (1.1.3+dfsg-4ubuntu4) raring; urgency=low
 
   * debian/patches/fix_manpages_generation_with_new_docutils.diff:

=== modified file 'debian/control'
--- debian/control	2012-08-21 17:45:58 +0000
+++ debian/control	2012-11-01 17:56:20 +0000
@@ -4,9 +4,9 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Jakub Wilk <[e-mail]>
 Uploaders: Debian Python Modules Team <[e-mail]>
-Homepage: http://sphinx.pocoo.org/
+Homepage: http://sphinx-doc.org/
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: python-all (>= 2.6.5-2~), python3 (>= 3.1.2-7~),
+Build-Depends-Indep: python-all (>= 2.6.5-2~), python3-all (>= 3.1.2-7~),
   python-setuptools (>= 0.6c5-1~), python3-setuptools,
   python-docutils (>= 0.7), python3-docutils (>= 0.7),
   python-pygments (>= 1.2), python3-pygments (>= 1.2),

=== added file 'debian/patches/fix_manpages_generation_with_new_docutils.diff'
--- debian/patches/fix_manpages_generation_with_new_docutils.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_manpages_generation_with_new_docutils.diff	2012-11-01 17:56:20 +0000
@@ -0,0 +1,33 @@
+Description: Fix build failure with Docutils 0.9
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage
+Author: Toshio Kuratomi <[e-mail]>
+Last-Update: 2012-10-22
+
+diff -up a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py
+--- a/sphinx/writers/manpage.py	2011-11-01 00:38:44.000000000 -0700
++++ b/sphinx/writers/manpage.py	2012-08-21 12:38:33.380808202 -0700
+@@ -72,6 +72,11 @@ class ManualPageTranslator(BaseTranslato
+         # 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 @@ class ManualPageTranslator(BaseTranslato
+     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 = []

=== removed file 'debian/patches/fix_manpages_generation_with_new_docutils.diff'
--- debian/patches/fix_manpages_generation_with_new_docutils.diff	2012-10-22 20:20:35 +0000
+++ debian/patches/fix_manpages_generation_with_new_docutils.diff	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-Description: Fix build failure with Docutils 0.9
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage
-Author: Toshio Kuratomi <[e-mail]>
-Last-Update: 2012-10-22
-
-diff -up a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py
---- a/sphinx/writers/manpage.py	2011-11-01 00:38:44.000000000 -0700
-+++ b/sphinx/writers/manpage.py	2012-08-21 12:38:33.380808202 -0700
-@@ -72,6 +72,11 @@ class ManualPageTranslator(BaseTranslato
-         # 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 @@ class ManualPageTranslator(BaseTranslato
-     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 file 'debian/patches/series'
--- debian/patches/series	2012-10-22 20:20:35 +0000
+++ debian/patches/series	2012-11-01 17:56:20 +0000
@@ -9,3 +9,4 @@
 pygments_byte_strings.diff
 fix_shorthandoff.diff
 fix_manpages_generation_with_new_docutils.diff
+support_python_3.3.diff

=== added file 'debian/patches/support_python_3.3.diff'
--- debian/patches/support_python_3.3.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/support_python_3.3.diff	2012-11-01 17:56:20 +0000
@@ -0,0 +1,87 @@
+Description: Fix various testsuite failures with Python 3.3
+Author: Takayuki Shimizukawa <[e-mail]>
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1008/test-failures-with-python-33
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1070336
+Last-Update: 2012-11-01
+
+=== modified file 'sphinx/environment.py'
+--- a/sphinx/environment.py	2012-03-30 23:32:16 +0000
++++ b/sphinx/environment.py	2012-11-01 17:33:08 +0000
+@@ -782,7 +782,11 @@
+             app.emit('doctree-read', doctree)
+ 
+         # store time of build, for outdated files detection
+-        self.all_docs[docname] = time.time()
++        # (Some filesystems have coarse timestamp resolution;
++        # therefore time.time() is older than filesystem's timestamp.
++        # For example, FAT32 has 2sec timestamp resolution.)
++        self.all_docs[docname] = max(
++                time.time(), path.getmtime(self.doc2path(docname)))
+ 
+         if self.versioning_condition:
+             # get old doctree
+
+=== modified file 'sphinx/ext/autodoc.py'
+--- a/sphinx/ext/autodoc.py	2012-03-30 23:32:16 +0000
++++ b/sphinx/ext/autodoc.py	2012-11-01 17:33:08 +0000
+@@ -1098,7 +1098,7 @@
+     """
+     objtype = 'method'
+     member_order = 50
+-    priority = 0
++    priority = 1  # must be more than FunctionDocumenter
+ 
+     @classmethod
+     def can_document_member(cls, member, membername, isattr, parent):
+
+=== modified file 'sphinx/ext/intersphinx.py'
+--- a/sphinx/ext/intersphinx.py	2012-03-30 23:32:16 +0000
++++ b/sphinx/ext/intersphinx.py	2012-11-01 17:33:13 +0000
+@@ -188,7 +188,17 @@
+     if update:
+         env.intersphinx_inventory = {}
+         env.intersphinx_named_inventory = {}
+-        for name, _, invdata in cache.itervalues():
++        # Duplicate values in different inventories will shadow each
++        # other; which one will override which can vary between builds
++        # since they are specified using an unordered dict.  To make
++        # it more consistent, we sort the named inventories and then
++        # add the unnamed inventories last.  This means that the
++        # unnamed inventories will shadow the named ones but the named
++        # ones can still be accessed when the name is specified.
++        cached_vals = list(cache.itervalues())
++        named_vals = sorted(v for v in cached_vals if v[0])
++        unnamed_vals = [v for v in cached_vals if not v[0]]
++        for name, _, invdata in named_vals + unnamed_vals:
+             if name:
+                 env.intersphinx_named_inventory[name] = invdata
+             for type, objects in invdata.iteritems():
+
+=== modified file 'sphinx/util/__init__.py'
+--- a/sphinx/util/__init__.py	2012-03-30 23:32:16 +0000
++++ b/sphinx/util/__init__.py	2012-11-01 17:37:41 +0000
+@@ -197,13 +197,18 @@
+         except Exception, err:
+             raise PycodeError('error importing %r' % modname, err)
+     mod = sys.modules[modname]
+-    if hasattr(mod, '__loader__'):
+-        try:
+-            source = mod.__loader__.get_source(modname)
++    filename = getattr(mod, '__file__', None)
++    loader = getattr(mod, '__loader__', None)
++    if loader and getattr(loader, 'get_filename', None):
++        try:
++            filename = loader.get_filename(modname)
++        except Exception, err:
++            raise PycodeError('error getting filename for %r' % filename, err)
++    if filename is None and loader:
++        try:
++            return 'string', loader.get_source(modname)
+         except Exception, err:
+             raise PycodeError('error getting source for %r' % modname, err)
+-        return 'string', source
+-    filename = getattr(mod, '__file__', None)
+     if filename is None:
+         raise PycodeError('no source found for module %r' % modname)
+     filename = path.normpath(path.abspath(filename))
+

=== modified file 'sphinx/writers/manpage.py'
--- sphinx/writers/manpage.py	2012-10-22 20:20:35 +0000
+++ sphinx/writers/manpage.py	2012-11-01 17:56:20 +0000
@@ -72,11 +72,6 @@
         # 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\""
@@ -198,6 +193,12 @@
     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 = []