[Python-modules-commits] [jupyter-client] 08/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-client.

commit a3394fd39d0ee41a369a7dcd414f1ebc5541c828
Merge: 8ad99a7 0203b2d
Author: Gordon Ball <gordon at chronitis.net>
Date:   Mon Dec 18 16:27:26 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-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 9173414,0000000..77b826d
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
- f13881542dc2997f49c02b2834a1de2fb06b79aa
- f13881542dc2997f49c02b2834a1de2fb06b79aa
++0203b2d3744864970e806a6c8c2616b34df53332
++0203b2d3744864970e806a6c8c2616b34df53332
 +f13881542dc2997f49c02b2834a1de2fb06b79aa
 +f13881542dc2997f49c02b2834a1de2fb06b79aa
 +jupyter-client_5.2.0.orig.tar.gz
 +2bd8522cf63381d06060ae1a0285a6e2a07d3a64
 +273246
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Disable-sphinxcontrib_github_alt.patch
index 0000000,0000000..077a02b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Disable-sphinxcontrib_github_alt.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 0203b2d3744864970e806a6c8c2616b34df53332 Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Mon, 18 Dec 2017 16:26:25 +0000
++Subject: Disable sphinxcontrib_github_alt
++
++Disables the sphinx extension sphinxcontrib_github_alt (unpackaged)
++during the documentation build.
++---
++ docs/conf.py | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index c3de08e..577c2b7 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -34,7 +34,6 @@ extensions = [
++     'sphinx.ext.autodoc',
++     'sphinx.ext.intersphinx',
++     'sphinx.ext.napoleon',
++-    'sphinxcontrib_github_alt',
++ ]
++ 
++ # Add any paths that contain templates here, relative to this directory.
diff --cc debian/patches/series
index 0000000,0000000..8966d77
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Disable-sphinxcontrib_github_alt.patch

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