[Python-modules-commits] [jupyter-notebook] 07/11: 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 3195482c85a8e69e7541183137cf60a48bc491b5
Merge: 55528fd 606e3e9
Author: Gordon Ball <gordon at chronitis.net>
Date:   Sun Jun 25 11:53:30 2017 +0200

    merge patched into master

 debian/.git-dpm                                       |  4 ++--
 ...rrors-in-documentation-notebooks-during-buil.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 docs/source/conf.py                                   |  2 ++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 241388e,0000000..4e0c467
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
- 6249f12e67e2e37dc45e2f50c35312ca70ca649b
- 6249f12e67e2e37dc45e2f50c35312ca70ca649b
++606e3e9685110115631e3d869c55d8fe97cc7251
++606e3e9685110115631e3d869c55d8fe97cc7251
 +9ffa64eb4552f7b0a11e62aded335efd951ffb1f
 +9ffa64eb4552f7b0a11e62aded335efd951ffb1f
 +jupyter-notebook_5.0.0.orig.tar.gz
 +fba3df6916a11f5a8f3f0ebb222f0854c01aa76d
 +5723350
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0008-Ignore-errors-in-documentation-notebooks-during-buil.patch
index 0000000,0000000..fda1b4e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-Ignore-errors-in-documentation-notebooks-during-buil.patch
@@@ -1,0 -1,0 +1,19 @@@
++From 606e3e9685110115631e3d869c55d8fe97cc7251 Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Sun, 25 Jun 2017 11:53:23 +0200
++Subject: Ignore errors in documentation notebooks during build
++
++---
++ docs/source/conf.py | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/docs/source/conf.py b/docs/source/conf.py
++index d35dead..81a1b89 100644
++--- a/docs/source/conf.py
+++++ b/docs/source/conf.py
++@@ -347,3 +347,5 @@ mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax/js?config=TeX-AMD-M
++ 
++ spelling_lang='en_US'
++ spelling_word_list_filename='spelling_wordlist.txt'
+++
+++nbsphinx_allow_errors = True
diff --cc debian/patches/series
index a01fa96,0000000..d731e88
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
 +0001-Nodejs-binary-and-import-names.patch
 +0002-Use-local-MathJax-in-documentation.patch
 +0003-Unmask-setuptools-in-setup.py-so-dependencies-are-de.patch
 +0004-jquery-ui-1.12-compatibility-changes.patch
 +0005-Call-lessc-with-source-map-basepath-option-for-repro.patch
 +0006-Work-around-https-github.com-less-less.js-pull-3002.patch
 +0007-Debian-specific-hack-to-fix-upstream-s-non-increment.patch
++0008-Ignore-errors-in-documentation-notebooks-during-buil.patch

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