[Python-modules-commits] [jupyter-core] 09/10: 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-core.

commit ddf557c113353ed89150ae49981eaf91d1f274e0
Merge: b7b6569 8fc651b
Author: Gordon Ball <gordon at chronitis.net>
Date:   Thu Nov 2 11:01:24 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0003-Disable-sphinxcontrib_github_alt.patch    | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  1 -
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 1998085,0000000..7f2acc5
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
- 53992894b57902053c2537d97a4d0806b5a32807
- 53992894b57902053c2537d97a4d0806b5a32807
++8fc651bbb31cf32c30f74a3d30e16c8cd3872bfb
++8fc651bbb31cf32c30f74a3d30e16c8cd3872bfb
 +0a51b77abfb635f7e6ed76c012e80d094854ba08
 +0a51b77abfb635f7e6ed76c012e80d094854ba08
 +jupyter-core_4.4.0.orig.tar.gz
 +04fe74c545381a0b6894cdb840189adf09090072
 +59781
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Disable-sphinxcontrib_github_alt.patch
index 0000000,0000000..0c09c87
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Disable-sphinxcontrib_github_alt.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 8fc651bbb31cf32c30f74a3d30e16c8cd3872bfb Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Thu, 2 Nov 2017 11:00:10 +0000
++Subject: Disable sphinxcontrib_github_alt
++
++This extension is not packaged at this time (although is only a single
++file which could perhaps be bundled).
++---
++ docs/conf.py | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 6fa60ea..9eae0a6 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -33,7 +33,6 @@ import shlex
++ extensions = [
++     'sphinx.ext.autodoc',
++     'sphinx.ext.intersphinx',
++-    'sphinxcontrib_github_alt',
++ ]
++ 
++ github_project_url = "https://github.com/jupyter/jupyter_core"
diff --cc debian/patches/series
index 16947a2,0000000..9f3a3c6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Use-setuptools-for-everything-so-the-python-Depends-.patch
 +0002-Fix-ENV_CONFIG_PATH-for-Debian-systems-we-never-use-.patch
++0003-Disable-sphinxcontrib_github_alt.patch

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