[Python-modules-commits] [jupyter-notebook] 04/08: merge patched into master

[Gordon Ball]

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

chronitis-guest pushed a commit to branch master
in repository jupyter-notebook.

commit 5395d70dd6828daed09fb51ae5be442da624601e
Merge: 2321fbc c1d7774
Author: Gordon Ball <gordon at chronitis.net>
Date:   Thu Oct 27 17:20:58 2016 +0200

    merge patched into master

 debian/.git-dpm                                       |  4 ++--
 .../0002-Use-local-MathJax-in-documentation.patch     | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 docs/source/conf.py                                   |  2 ++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 9eb7eb0,0000000..4df9764
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 10f494574090f1cd92304d3c5949951f7c34f09a
- 10f494574090f1cd92304d3c5949951f7c34f09a
++c1d77748a9887228746fe7467464ccec38cca8f5
++c1d77748a9887228746fe7467464ccec38cca8f5
 +1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
 +1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
 +jupyter-notebook_4.2.3.orig.tar.gz
 +cd42c2013047d2722d3990db4787820cff51cbc8
 +4456566
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Use-local-MathJax-in-documentation.patch
index 0000000,0000000..88ce1ec
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-local-MathJax-in-documentation.patch
@@@ -1,0 -1,0 +1,19 @@@
++From c1d77748a9887228746fe7467464ccec38cca8f5 Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Thu, 27 Oct 2016 17:20:12 +0200
++Subject: Use local MathJax in documentation
++
++---
++ docs/source/conf.py | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/docs/source/conf.py b/docs/source/conf.py
++index d32d0da..238a0c4 100644
++--- a/docs/source/conf.py
+++++ b/docs/source/conf.py
++@@ -332,3 +332,5 @@ intersphinx_mapping = {
++     'nbformat': ('http://nbformat.readthedocs.org/en/latest/', None),
++     'jupyter': ('http://jupyter.readthedocs.org/en/latest/', None),
++ }
+++
+++mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax/js?config=TeX-AMD-MML_HTMLorMML'
diff --cc debian/patches/series
index c94e8d9,0000000..b18cab1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Nodejs-binary-and-import-names.patch
++0002-Use-local-MathJax-in-documentation.patch

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