[Python-modules-commits] [elasticsearch-curator] 02/06: merge patched into master

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository elasticsearch-curator.

commit 8d6e9ee4db79b489627f6d10a68bef13019aaa44
Merge: f52683d 752163e
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Jul 22 23:49:31 2016 +0300

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...local-inventory-references-for-intersphin.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  6 +++--
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 5ae44c0,0000000..91d09d2
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
- dfa1c8cc1aedbc83b7620fdef6fd7fb680fe4f91
- dfa1c8cc1aedbc83b7620fdef6fd7fb680fe4f91
++752163e963ff2d81f863778315bb4433b45ac62b
++752163e963ff2d81f863778315bb4433b45ac62b
 +85f6a59b76ddb85142061690b1e2de87c4fc4cfc
 +85f6a59b76ddb85142061690b1e2de87c4fc4cfc
 +elasticsearch-curator_4.0.1.orig.tar.gz
 +85db7214c7197e21e827c38fd7d0f717cacee7e3
 +107792
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-sphinx-use-local-inventory-references-for-intersphin.patch
index 0000000,0000000..7d770bf
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-sphinx-use-local-inventory-references-for-intersphin.patch
@@@ -1,0 -1,0 +1,30 @@@
++From 752163e963ff2d81f863778315bb4433b45ac62b Mon Sep 17 00:00:00 2001
++From: Apollon Oikonomopoulos <apoikos at debian.org>
++Date: Fri, 22 Jul 2016 23:48:07 +0300
++Subject: sphinx: use local inventory references for intersphinx
++
++Note that we will not be making this conditional: we want the build to
++fail if intersphinx was to fetch inventory data from the internet.
++
++Closes: #830550
++---
++ docs/conf.py | 6 ++++--
++ 1 file changed, 4 insertions(+), 2 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 6ff9369..95ffc43 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -47,8 +47,10 @@ sys.path.insert(0, os.path.abspath('../'))
++ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx']
++ 
++ intersphinx_mapping = {
++-	'python': ('https://docs.python.org/3.5', None),
++-	'elasticsearch': ('http://elasticsearch-py.readthedocs.io/en/2.3.0', None),
+++	'python': ('https://docs.python.org/3.5',
+++               '/usr/share/doc/python3-doc/html/objects.inv'),
+++	'elasticsearch': ('http://elasticsearch-py.readthedocs.io/en/2.3.0',
+++               '/usr/share/doc/python-elasticsearch-doc/html/objects.inv'),
++ }
++ 
++ autoclass_content = "both"
diff --cc debian/patches/series
index e2d8982,0000000..d2718c5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +setup.py-read-README-utf-8
++0002-sphinx-use-local-inventory-references-for-intersphin.patch

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