[med-svn] [python-ruffus] 02/02: Fix sphinx.ext.mathjax: other math package is already loaded

[Andreas Tille]

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

tille pushed a commit to branch master
in repository python-ruffus.

commit 87d2320b730125a108737936623a1b0d60908ab6
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jul 25 13:42:40 2016 +0200

    Fix sphinx.ext.mathjax: other math package is already loaded
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 debian/patches/sphinx.ext.pngmath_deprecated.patch | 16 ++++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 80cc25e..192fe4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 python-ruffus (2.6.3+dfsg-4) UNRELEASED; urgency=medium
 
   * Point watch file to Github which is more reliable.
+  * Drop sphinx.ext.pngmath
+    Closes: #832299
 
  -- Andreas Tille <tille at debian.org>  Mon, 25 Jul 2016 13:19:50 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 25a9472..5958ad9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix_test.patch
 python-3.5.patch
 use_libjs-mathjax.patch
+sphinx.ext.pngmath_deprecated.patch
diff --git a/debian/patches/sphinx.ext.pngmath_deprecated.patch b/debian/patches/sphinx.ext.pngmath_deprecated.patch
new file mode 100644
index 0000000..ea3b83e
--- /dev/null
+++ b/debian/patches/sphinx.ext.pngmath_deprecated.patch
@@ -0,0 +1,16 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 25 Jul 2016 13:19:50 +0200
+Bug-Debian: https://bugs.debian.org/832299
+Description: Fix sphinx.ext.mathjax: other math package is already loaded
+
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -30,7 +30,7 @@ import ruffus, ruffus.task, ruffus.ruffu
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo',
+-              'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig', 'sphinx.ext.viewcode']
++              'sphinx.ext.coverage', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig', 'sphinx.ext.viewcode']
+ 
+ mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-ruffus.git