[med-svn] [Git][med-team/sphinxcontrib-autoprogram][master] 5 commits: add upstream patch fo work with Sphinx 1.7

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / sphinxcontrib-autoprogram


Commits:
f6feb813 by Andreas Tille at 2018-04-17T11:04:22+02:00
add upstream patch fo work with Sphinx 1.7

- - - - -
0fd61126 by Andreas Tille at 2018-04-17T11:04:59+02:00
Standards-Version: 4.1.4

- - - - -
8891a56e by Andreas Tille at 2018-04-17T11:05:30+02:00
Point Vcs fields to salsa.debian.org

- - - - -
b6fc629c by Andreas Tille at 2018-04-17T11:06:13+02:00
Testsuite: autopkgtest-pkg-python

- - - - -
b999174f by Andreas Tille at 2018-04-17T11:06:42+02:00
Close bug

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/series
- + debian/patches/sphinx_1.7.patch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ sphinxcontrib-autoprogram (0.1.4-1) UNRELEASED; urgency=medium
   * cme fix dpkg-control
   * debhelper 11
   * d/watch: Use https://pypi.debian.net
+  * add upstream patch fo work with Sphinx 1.7
+    Closes: #895849
+  * Standards-Version: 4.1.4
+  * Point Vcs fields to salsa.debian.org
+  * Testsuite: autopkgtest-pkg-python
 
  -- Andreas Tille <tille at debian.org>  Mon, 26 Mar 2018 19:06:47 +0200
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Uploaders: Tim Booth <tbooth at ceh.ac.uk>,
            Andreas Tille <tille at debian.org>,
            Kevin Murray <spam at kdmurray.id.au>
 Section: python
+Testsuite: autopkgtest-pkg-python
 Priority: optional
 Build-Depends: debhelper (>= 11~),
                dh-python,
@@ -13,9 +14,9 @@ Build-Depends: debhelper (>= 11~),
                python3,
                python3-setuptools,
                python3-sphinx
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/sphinxcontrib-autoprogram.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/sphinxcontrib-autoprogram.git
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/sphinxcontrib-autoprogram
+Vcs-Git: https://salsa.debian.org/med-team/sphinxcontrib-autoprogram.git
 Homepage: https://pythonhosted.org/sphinxcontrib-autoprogram/
 
 Package: sphinxcontrib-autoprogram


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+sphinx_1.7.patch


=====================================
debian/patches/sphinx_1.7.patch
=====================================
--- /dev/null
+++ b/debian/patches/sphinx_1.7.patch
@@ -0,0 +1,27 @@
+From: Zach Riggle <zachriggle at users.noreply.github.com>
+Date: Tue, 20 Feb 2018 12:41:42 -0600
+Subject: [PATCH] Make autoprogram work with Sphinx 1.7
+Bug-Debian: https://bugs.debian.org/895849
+Origin: https://github.com/sphinx-contrib/autoprogram/pull/2/commits/9b807e77a52fa242e14844fc4accf883a67cef9e
+
+`sphinx.util.compat` was removed from Sphinx 1.7
+---
+ sphinxcontrib/autoprogram.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/sphinxcontrib/autoprogram.py
++++ b/sphinxcontrib/autoprogram.py
+@@ -25,6 +25,13 @@ from six.moves import builtins, reduce
+ from sphinx.domains import std
+ from sphinx.util.nodes import nested_parse_with_titles
+ 
++try:
++    # sphinx.util.compat.Directive class is now deprecated.
++    # Please use instead docutils.parsers.rst.Directive
++    from sphinx.util.compat import Directive
++except ImportError:
++    from docutils.parsers.rst import Directive
++
+ __all__ = ('AutoprogramDirective',
+            'AutoprogramDirectiveTestCase', 'ScannerTestCase',
+            'import_object', 'scan_programs', 'setup', 'suite')



View it on GitLab: https://salsa.debian.org/med-team/sphinxcontrib-autoprogram/compare/c42422131b21fb0020c11a4076cde51f38f7070c...b999174f4c257451136799679d6fe807aa57acc0

---
View it on GitLab: https://salsa.debian.org/med-team/sphinxcontrib-autoprogram/compare/c42422131b21fb0020c11a4076cde51f38f7070c...b999174f4c257451136799679d6fe807aa57acc0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180417/809a0be6/attachment-0001.html>