[Python-modules-commits] [cf-python] 05/17: merge patched into master

[Klaus Zimmermann]

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

zklaus-guest pushed a commit to branch master
in repository cf-python.

commit dfbad0a5dc48abfb78cc19c9bd13bd6ce806abdf
Merge: 1a6851c 0016b07
Author: Klaus Zimmermann <klaus.zimmermann at ts.infn.it>
Date:   Thu Aug 18 11:24:49 2016 +0200

    merge patched into master

 debian/.git-dpm                            |  4 ++--
 debian/patches/0001-packaged-mathjax.patch | 23 +++++++++++++++++++++++
 debian/patches/series                      |  1 +
 docs/source/conf.py                        |  2 ++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index d44ac28,0000000..6fe07fe
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 53f5be07a493e00a0b38a62149f6b9b03fb415bc
- 53f5be07a493e00a0b38a62149f6b9b03fb415bc
++0016b078b171d02b41d4712b77309e0f27466a80
++0016b078b171d02b41d4712b77309e0f27466a80
 +53f5be07a493e00a0b38a62149f6b9b03fb415bc
 +53f5be07a493e00a0b38a62149f6b9b03fb415bc
 +cf-python_1.2.1.orig.tar.gz
 +3c56b1636a7799c5ec38a1480f604b161f201f96
 +3953039
diff --cc debian/patches/0001-packaged-mathjax.patch
index 0000000,0000000..90bffda
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-packaged-mathjax.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 0016b078b171d02b41d4712b77309e0f27466a80 Mon Sep 17 00:00:00 2001
++From: Klaus Zimmermann <klaus.zimmermann at ts.infn.it>
++Date: Thu, 18 Aug 2016 11:24:36 +0200
++Subject: packaged mathjax
++
++Use packaged copy of math-jax.
++---
++ docs/source/conf.py | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/docs/source/conf.py b/docs/source/conf.py
++index 06f0a02..4343209 100755
++--- a/docs/source/conf.py
+++++ b/docs/source/conf.py
++@@ -40,6 +40,8 @@ extensions = ['sphinx.ext.autodoc',
++               'sphinx.ext.doctest',
++               ]
++ 
+++mathjax_path = 'mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
+++
++ # Boolean indicating whether to scan all found documents for
++ # autosummary directives, and to generate stub pages for each
++ # (http://sphinx-doc.org/latest/ext/autosummary.html)
diff --cc debian/patches/series
index 0000000,0000000..2db61f6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-packaged-mathjax.patch

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