[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 2ed2ac1956da2b0854ff9083f8b0205da09c0542
Merge: a4ca38f 694a471
Author: Barry Warsaw <barry at python.org>
Date:   Tue Oct 25 16:27:55 2016 -0400

    merge patched into master

 CHANGES.txt                            | 12 ++++++++++++
 PKG-INFO                               | 14 +++++++++++++-
 WebOb.egg-info/PKG-INFO                | 14 +++++++++++++-
 debian/.git-dpm                        |  6 +++---
 debian/patches/intersphinx-local.patch |  2 +-
 docs/reference.txt                     |  4 ++++
 docs/whatsnew-1.6.txt                  | 15 ++++++++++++---
 setup.cfg                              |  2 +-
 setup.py                               |  2 +-
 webob/exc.py                           | 15 +++++++++++----
 10 files changed, 71 insertions(+), 15 deletions(-)

diff --cc debian/.git-dpm
index 4a25a16,0000000..a79ca81
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
- 74be2e727d5cfa79e6d7d0c8d4d5b725d594faed
- 74be2e727d5cfa79e6d7d0c8d4d5b725d594faed
- b4f29c324f8fcb0bb1b28ee44ff0d7e66b76c5cb
++694a471e6b809c4bcb666761f08cd87febd4407c
++694a471e6b809c4bcb666761f08cd87febd4407c
++7629d4b6d5feac2be0247e7787d91b2aedf544ce
 +7629d4b6d5feac2be0247e7787d91b2aedf544ce
 +python-webob_1.6.2.orig.tar.gz
 +4e59f44f5e295f0302281008afe95841c641de22
 +205228
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx-local.patch
index 0129eac,0000000..9bebb01
mode 100644,000000..100644
--- a/debian/patches/intersphinx-local.patch
+++ b/debian/patches/intersphinx-local.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 74be2e727d5cfa79e6d7d0c8d4d5b725d594faed Mon Sep 17 00:00:00 2001
++From 694a471e6b809c4bcb666761f08cd87febd4407c 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),
 + }

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