[Python-modules-commits] [psycopg2] 01/01: d/p/0002-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch (Closes: #876931)

Scott Kitterman kitterman at moszumanska.debian.org
Tue Jan 9 05:42:21 UTC 2018


This is an automated email from the git hooks/post-receive script.

kitterman pushed a commit to branch debian/master
in repository psycopg2.

commit 4ac0466e80ea6ae1c364ae4a39d6ae7f6d858986
Author: Scott Kitterman <scott at kitterman.com>
Date:   Tue Jan 9 00:33:29 2018 -0500

    d/p/0002-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch (Closes: #876931)
    
    * d/p/0002-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch
      (Closes: #876931)
      - Thanks to Corey Bryant for forwarding the patch from Ubuntu
---
 debian/changelog                                   |  8 +++++
 ...i_extension.py-compatible-with-Sphinx-1.6.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 48 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1c16e23..c5b2957 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+psycopg2 (2.7.3-2) unstable; urgency=medium
+
+  * d/p/0002-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch
+    (Closes: #876931)
+    - Thanks to Corey Bryant for forwarding the patch from Ubuntu
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 09 Jan 2018 00:30:11 -0500
+
 psycopg2 (2.7.3-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/0002-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch b/debian/patches/0002-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch
new file mode 100644
index 0000000..cc29667
--- /dev/null
+++ b/debian/patches/0002-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch
@@ -0,0 +1,39 @@
+From: Scott Kitterman <scott at kitterman.com>
+Date: Tue, 9 Jan 2018 00:29:17 -0500
+Subject: Make dbapi_extension.py compatible with Sphinx 1.6
+
+---
+ doc/src/tools/lib/dbapi_extension.py | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/doc/src/tools/lib/dbapi_extension.py b/doc/src/tools/lib/dbapi_extension.py
+index cb3fec4..7ab656f 100755
+--- a/doc/src/tools/lib/dbapi_extension.py
++++ b/doc/src/tools/lib/dbapi_extension.py
+@@ -12,7 +12,7 @@
+ from docutils import nodes
+ 
+ from sphinx.locale import _
+-from sphinx.util.compat import Directive, make_admonition
++from docutils.parsers.rst import Directive
+ 
+ class extension_node(nodes.Admonition, nodes.Element): pass
+ 
+@@ -29,12 +29,11 @@ class Extension(Directive):
+     option_spec = {}
+ 
+     def run(self):
+-        nodes = make_admonition(extension_node,
+-                self.name, [_('DB API extension')], self.options,
+-                self.content, self.lineno, self.content_offset,
+-                self.block_text, self.state, self.state_machine)
+-        nodes[0]['classes'].append('dbapi-extension')
+-        return nodes
++        node = extension_node('\n'.join(self.content))
++        node += nodes.title(_('DB API extension'), _('DB API extension'))
++        self.state.nested_parse(self.content, self.content_offset, node)
++        node['classes'].append('dbapi-extension')
++        return [node]
+ 
+ 
+ def visit_extension_node(self, node):
diff --git a/debian/patches/series b/debian/patches/series
index 49e5426..ca711bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-local_inventory.patch
+0002-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch

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



More information about the Python-modules-commits mailing list