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

[mitya57 at users.alioth.debian.org]

    Date: Tuesday, July 28, 2015 @ 19:15:14
  Author: mitya57
Revision: 33519

Drop initialize_autodoc.diff, the bug seems to be fixed differently
upstream.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series
Deleted:
  packages/sphinx/trunk/debian/patches/initialize_autodoc.diff

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2015-07-28 18:50:50 UTC (rev 33518)
+++ packages/sphinx/trunk/debian/changelog	2015-07-28 19:15:14 UTC (rev 33519)
@@ -12,6 +12,8 @@
   * dh_sphinxdoc: Add support for symlinking files specific to the RTD
     theme (closes: #781849).
   * Bump version number in sphinx-autogen manpage.
+  * Drop initialize_autodoc.diff, the bug seems to be fixed differently
+    upstream.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 18 Jul 2015 12:22:01 +0300
 

Deleted: packages/sphinx/trunk/debian/patches/initialize_autodoc.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/initialize_autodoc.diff	2015-07-28 18:50:50 UTC (rev 33518)
+++ packages/sphinx/trunk/debian/patches/initialize_autodoc.diff	2015-07-28 19:15:14 UTC (rev 33519)
@@ -1,33 +0,0 @@
-Description: make sphinx-autogen initialize the sphinx.ext.autodoc module
-Author: Jakub Wilk <jwilk at debian.org>
-Bug-Debian: http://bugs.debian.org/611078
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/618
-Forwarded: yes
-Last-Update: 2012-02-04
-
---- a/sphinx/ext/autosummary/generate.py
-+++ b/sphinx/ext/autosummary/generate.py
-@@ -29,6 +29,7 @@
- from jinja2 import FileSystemLoader, TemplateNotFound
- from jinja2.sandbox import SandboxedEnvironment
- 
-+from sphinx.ext import autodoc
- from sphinx import package_dir
- from sphinx.ext.autosummary import import_by_name, get_documenter
- from sphinx.jinja2glue import BuiltinTemplateLoader
-@@ -67,6 +68,15 @@
-     if len(args) < 1:
-         p.error('no input files given')
- 
-+    class Sphinx(object):
-+        def add_autodocumenter(self, cls):
-+            autodoc.add_documenter(cls)
-+        def add_event(self, name):
-+            pass
-+        def add_config_value(self, name, default, rebuild):
-+            pass
-+    autodoc.setup(Sphinx())
-+
-     generate_autosummary_docs(args, options.output_dir,
-                               "." + options.suffix,
-                               template_dir=options.templates)

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2015-07-28 18:50:50 UTC (rev 33518)
+++ packages/sphinx/trunk/debian/patches/series	2015-07-28 19:15:14 UTC (rev 33519)
@@ -1,5 +1,4 @@
 disable_distribute_setup.diff
-initialize_autodoc.diff
 no_external_css.diff
 disable_js_version_check.diff
 no_snowballstemmer.diff