[Python-modules-commits] [python-pykka] 06/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-pykka.

commit 7c7b686c2c5578a637416beb24a0e8645a4c6336
Merge: ba64664 e70e2ce
Author: Stein Magnus Jodal <jodal at debian.org>
Date:   Sun Aug 7 22:41:44 2016 +0200

    merge patched into master

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

diff --cc debian/.git-dpm
index d9b754b,0000000..45344f9
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
- 9c05f32bd98d4ea1fbf7bcd65d7ae8e628322c2c
- 9c05f32bd98d4ea1fbf7bcd65d7ae8e628322c2c
++e70e2ce8e2823bb134eeb03a949970dc0483ce9a
++e70e2ce8e2823bb134eeb03a949970dc0483ce9a
 +9c05f32bd98d4ea1fbf7bcd65d7ae8e628322c2c
 +9c05f32bd98d4ea1fbf7bcd65d7ae8e628322c2c
 +python-pykka_1.2.1.orig.tar.gz
 +00a928cba82f7debf46fb166ee40533f4dcca259
 +39206
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Make-intersphinx-use-object.inv-from-python-doc.patch
index 0000000,0000000..bc6a6c3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Make-intersphinx-use-object.inv-from-python-doc.patch
@@@ -1,0 -1,0 +1,20 @@@
++From e70e2ce8e2823bb134eeb03a949970dc0483ce9a Mon Sep 17 00:00:00 2001
++From: Stein Magnus Jodal <jodal at debian.org>
++Date: Sun, 7 Aug 2016 22:41:41 +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 ad79de3..cec8510 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -125,5 +125,5 @@ extlinks = {
++ # -- Options for intersphinx extension ----------------------------------------
++ 
++ intersphinx_mapping = {
++-    'python': ('http://docs.python.org/2', None),
+++    'python': ('/usr/share/doc/python-doc/html', None),
++ }
diff --cc debian/patches/series
index 0000000,0000000..23d34af
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-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-pykka.git