[Python-modules-commits] [python-webob] 04/05: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository python-webob.

commit cca387c53d9f9efc2369d02ada5a1bc3ff7f7997
Merge: 1407842 74be2e7
Author: Barry Warsaw <barry at python.org>
Date:   Tue Jul 12 11:01:41 2016 -0400

    merge patched into master

 debian/.git-dpm                        |  4 ++--
 debian/patches/intersphinx-local.patch | 23 +++++++++++++++++++++++
 debian/patches/series                  |  1 +
 docs/conf.py                           |  4 ++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 14b5912,0000000..fc7ec5c
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
- b4f29c324f8fcb0bb1b28ee44ff0d7e66b76c5cb
- b4f29c324f8fcb0bb1b28ee44ff0d7e66b76c5cb
++74be2e727d5cfa79e6d7d0c8d4d5b725d594faed
++74be2e727d5cfa79e6d7d0c8d4d5b725d594faed
 +b4f29c324f8fcb0bb1b28ee44ff0d7e66b76c5cb
 +b4f29c324f8fcb0bb1b28ee44ff0d7e66b76c5cb
 +python-webob_1.6.1.orig.tar.gz
 +b815ba45ea172c87a89fd4a21a27523200d45e83
 +204676
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx-local.patch
index 0000000,0000000..0129eac
new file mode 100644
--- /dev/null
+++ b/debian/patches/intersphinx-local.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 74be2e727d5cfa79e6d7d0c8d4d5b725d594faed Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Tue, 12 Jul 2016 11:00:18 -0400
++Subject: Use local python{,3}-doc for intersphinx.
++
++Patch-Name: intersphinx-local.patch
++---
++ docs/conf.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 321769e..8f49873 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -150,6 +150,6 @@ epub_exclude_files = ['search.html']
++ 
++ # Example configuration for intersphinx: refer to the Python standard library.
++ intersphinx_mapping = {
++-    'python': ('https://docs.python.org', None),
++-    'python3': ('https://docs.python.org/3', None),
+++    'python': ('/usr/share/doc/python-doc/html', None),
+++    'python3': ('/usr/share/doc/python3-doc/html', None),
++ }
diff --cc debian/patches/series
index 0000000,0000000..02711a0
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++intersphinx-local.patch

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