[Python-modules-commits] [python-ws4py] 05/07: merge patched into master

[Stein Magnus Jodal]

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

jodal pushed a commit to branch master
in repository python-ws4py.

commit 7f3521edbb34f0375a827979efe45754d2d381c6
Merge: c7a4189 750981d
Author: Stein Magnus Jodal <jodal at debian.org>
Date:   Sun Aug 7 22:56:14 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ntersphinx-use-object.inv-from-python-doc.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 23b11e3,0000000..26482b7
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
- a7d5ce7c1e8d39c2e68eeb6ef5bab72b3981dc37
- a7d5ce7c1e8d39c2e68eeb6ef5bab72b3981dc37
++750981d4c6165b945def438b4dd790c3326d03de
++750981d4c6165b945def438b4dd790c3326d03de
 +7f43f2a6bff1aabafad023652042439d7b9b8d84
 +7f43f2a6bff1aabafad023652042439d7b9b8d84
 +python-ws4py_0.3.4.orig.tar.gz
 +865bf7f4524ac4c5c3b16c9b6efd2c6bc24c497a
 +64676
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Make-intersphinx-use-object.inv-from-python-doc.patch
index 0000000,0000000..30cbb36
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Make-intersphinx-use-object.inv-from-python-doc.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 750981d4c6165b945def438b4dd790c3326d03de Mon Sep 17 00:00:00 2001
++From: Stein Magnus Jodal <jodal at debian.org>
++Date: Sun, 7 Aug 2016 22:56:09 +0200
++Subject: Make intersphinx use object.inv from python-doc
++
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 8db4293..56d356b 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -37,7 +37,7 @@ extensions = ['sphinx.ext.autodoc',
++               'sphinxcontrib.seqdiag']
++ autoclass_content = 'init'
++ autodoc_member_order = 'bysource'
++-intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None)}
+++intersphinx_mapping = {'python': ('/usr/share/doc/python-doc/html', None)}
++ 
++ # Add any paths that contain templates here, relative to this directory.
++ templates_path = ['_templates']
diff --cc debian/patches/series
index afe4e4f,0000000..6a6a433
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Fix-tests.patch
++0002-Make-intersphinx-use-object.inv-from-python-doc.patch

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