diffstat for sphinxcontrib-programoutput-0.11 sphinxcontrib-programoutput-0.11

 changelog                              |    8 ++++++
 patches/fix-tests-for-sphinx-1.8.patch |   38 +++++++++++++++++++++++++++++++++
 patches/series                         |    1 
 3 files changed, 47 insertions(+)

diff -Nru sphinxcontrib-programoutput-0.11/debian/changelog sphinxcontrib-programoutput-0.11/debian/changelog
--- sphinxcontrib-programoutput-0.11/debian/changelog	2018-01-21 14:01:43.000000000 +0000
+++ sphinxcontrib-programoutput-0.11/debian/changelog	2019-03-09 22:26:13.000000000 +0000
@@ -1,3 +1,11 @@
+sphinxcontrib-programoutput (0.11-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with Sphinx 1.8 by backporting patch from upstream.
+    (Closes: #918309)
+
+ -- Chris Lamb <lamby@debian.org>  Sat, 09 Mar 2019 22:26:13 +0000
+
 sphinxcontrib-programoutput (0.11-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru sphinxcontrib-programoutput-0.11/debian/patches/fix-tests-for-sphinx-1.8.patch sphinxcontrib-programoutput-0.11/debian/patches/fix-tests-for-sphinx-1.8.patch
--- sphinxcontrib-programoutput-0.11/debian/patches/fix-tests-for-sphinx-1.8.patch	1970-01-01 01:00:00.000000000 +0100
+++ sphinxcontrib-programoutput-0.11/debian/patches/fix-tests-for-sphinx-1.8.patch	2019-03-09 22:23:04.000000000 +0000
@@ -0,0 +1,38 @@
+--- sphinxcontrib-programoutput-0.11.orig/src/sphinxcontrib/programoutput/tests/__init__.py
++++ sphinxcontrib-programoutput-0.11/src/sphinxcontrib/programoutput/tests/__init__.py
+@@ -3,7 +3,7 @@ import os.path
+ import shutil
+ import tempfile
+ 
+-from docutils.parsers.rst import directives
++from docutils.parsers.rst import directives, roles
+ from sphinx.application import Sphinx
+ 
+ from functools import update_wrapper
+@@ -60,9 +60,12 @@ class AppMixin(object):
+         # sphinxcontrib.programoutput: directive u'program-output' is
+         # already registered, it will be overridden".
+         self.directives = directives._directives.copy()
++        # Likewise for 'eq'
++        self.roles = roles._roles.copy()
+ 
+     def tearDown(self):
+         directives._directives = self.directives
++        roles._roles = self.roles
+ 
+     @Lazy
+     def tmpdir(self):
+--- sphinxcontrib-programoutput-0.11.orig/src/sphinxcontrib/programoutput/__init__.py
++++ sphinxcontrib-programoutput-0.11/src/sphinxcontrib/programoutput/__init__.py
+@@ -218,6 +218,11 @@ def run_programs(app, doctree):
+             error_message = 'Command {0} failed: {1}'.format(command, error)
+             error_node = doctree.reporter.error(error_message, base_node=node)
+             node.replace_self(error_node)
++            # Sphinx 1.8.0b1 started dropping all system_message nodes with a
++            # level less than 5 by default (or 2 if `keep_warnings` is set to true).
++            # This appears to be undocumented. Reporting failures is an important
++            # part of what this extension does, so we raise the default level.
++            error_node['level'] = 6
+         else:
+             if returncode != node['returncode']:
+                 app.warn('Unexpected return code {0} from command {1}'.format(
diff -Nru sphinxcontrib-programoutput-0.11/debian/patches/series sphinxcontrib-programoutput-0.11/debian/patches/series
--- sphinxcontrib-programoutput-0.11/debian/patches/series	2017-11-18 13:19:22.000000000 +0000
+++ sphinxcontrib-programoutput-0.11/debian/patches/series	2019-03-09 22:26:13.000000000 +0000
@@ -1 +1,2 @@
 remove-failing-tests-when-LANG-equal-C.patch
+fix-tests-for-sphinx-1.8.patch