[python-dtcwt] 17/22: Simplify integration with the system MathJax

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository python-dtcwt.

commit 93d2486118aeba5ef256cb535218ddcf1c913447
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Sep 15 09:43:02 2017 +0100

    Simplify integration with the system MathJax
    
    - Hardcode the path to MathJax in conf.py
    - Drop the .links file, no longer required
    - Drop dh_sphinxdoc override, no longer required
    
    Gbp-Dch: Full
---
 debian/patches/use-system-mathjax.patch | 13 ++++++-------
 debian/python-dtcwt-doc.links           |  1 -
 debian/rules                            |  3 ---
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/patches/use-system-mathjax.patch b/debian/patches/use-system-mathjax.patch
index 3a3fe35..5b719e5 100644
--- a/debian/patches/use-system-mathjax.patch
+++ b/debian/patches/use-system-mathjax.patch
@@ -6,13 +6,12 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -191,6 +191,9 @@
- if os.environ.get('READTHEDOCS', None) == 'True':
-     mathjax_path = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
+@@ -53,6 +53,8 @@
+     'matplotlib.sphinxext.plot_directive',
+ ]
  
-+# Override required in order to use Debian's system mathjax
-+mathjax_path = 'MathJax.js'
++mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
 +
- # -- Options for LaTeX output --------------------------------------------------
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
  
- latex_elements = {
diff --git a/debian/python-dtcwt-doc.links b/debian/python-dtcwt-doc.links
deleted file mode 100644
index 6b1ad90..0000000
--- a/debian/python-dtcwt-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/mathjax/MathJax.js usr/share/doc/python-dtcwt/html/_static/MathJax.js
diff --git a/debian/rules b/debian/rules
index f86f507..d65cb45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,5 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. sphinx-build -N -bhtml docs/ build/html
 endif
 
-override_dh_sphinxdoc:
-	dh_sphinxdoc --exclude=MathJax.js
-
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

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