Control: tags 896627 + patch
Control: tags 896627 + pending
Dear maintainer,
I've prepared an NMU for pygments (versioned as 2.2.0+dfsg-1.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru pygments-2.2.0+dfsg/debian/changelog pygments-2.2.0+dfsg/debian/changelog
--- pygments-2.2.0+dfsg/debian/changelog 2017-01-24 00:25:26.000000000 +0200
+++ pygments-2.2.0+dfsg/debian/changelog 2018-09-23 09:41:25.000000000 +0300
@@ -1,3 +1,11 @@
+pygments (2.2.0+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add fix for FTBFS with Sphinx 1.7,
+ thanks to Dmitry Shachnev. (Closes: #896627)
+
+ -- Adrian Bunk <b...@debian.org> Sun, 23 Sep 2018 09:41:25 +0300
+
pygments (2.2.0+dfsg-1) unstable; urgency=medium
* New upstream release.
diff -Nru pygments-2.2.0+dfsg/debian/patches/series pygments-2.2.0+dfsg/debian/patches/series
--- pygments-2.2.0+dfsg/debian/patches/series 2017-01-24 00:25:00.000000000 +0200
+++ pygments-2.2.0+dfsg/debian/patches/series 2018-09-23 09:41:23.000000000 +0300
@@ -1 +1,2 @@
change_docs_theme.patch
+sphinx_1.7.patch
diff -Nru pygments-2.2.0+dfsg/debian/patches/sphinx_1.7.patch pygments-2.2.0+dfsg/debian/patches/sphinx_1.7.patch
--- pygments-2.2.0+dfsg/debian/patches/sphinx_1.7.patch 1970-01-01 02:00:00.000000000 +0200
+++ pygments-2.2.0+dfsg/debian/patches/sphinx_1.7.patch 2018-09-23 09:41:12.000000000 +0300
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User WAKAYAMA Shirou <shirou....@gmail.com>
+# Date 1500298269 -32400
+# Node ID 1a78f58afb5066cf35b04676d0d5ffbb18d5d540
+# Parent 7941677dc77d4f2bf0bbd6140ade85a9454b8b80
+Change to docutils.parsers in sphinxext.
+
+From Sphinx 1.7, sphinx.utils.compat will be removed.
+
+diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py
+--- a/pygments/sphinxext.py
++++ b/pygments/sphinxext.py
+@@ -16,7 +16,7 @@
+
+ from docutils import nodes
+ from docutils.statemachine import ViewList
+-from sphinx.util.compat import Directive
++from docutils.parsers.rst import Directive
+ from sphinx.util.nodes import nested_parse_with_titles
+
+
