[Python-modules-commits] [pytest] 02/03: merge patched into master

[Sebastian Ramacher]

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

sramacher pushed a commit to tag debian/2.9.2-2
in repository pytest.

commit fd6b5e42fb2d9762ebcf923934b6cc4f519e7eff
Merge: 1be01d3 0542b7c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Jul 14 23:02:55 2016 +0200

    merge patched into master

 debian/.git-dpm                  |  4 ++--
 debian/patches/intersphinx.patch | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 doc/en/conf.py                   | 15 +++++++++++----
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 9d591e0,0000000..d4bd360
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
- fbb23c4df1493b8ded70386e5ced1ab76e12c198
- fbb23c4df1493b8ded70386e5ced1ab76e12c198
++0542b7c2618956eb202a15c68edba7f2fedbb6b4
++0542b7c2618956eb202a15c68edba7f2fedbb6b4
 +25454da31503990848b614982e8b2d43ec96beac
 +25454da31503990848b614982e8b2d43ec96beac
 +pytest_2.9.2.orig.tar.gz
 +586675a7ce39cd33e16b34cc539240b38c10d5e8
 +700808
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index 0000000,0000000..be9d052
new file mode 100644
--- /dev/null
+++ b/debian/patches/intersphinx.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 0542b7c2618956eb202a15c68edba7f2fedbb6b4 Mon Sep 17 00:00:00 2001
++From: Sebastian Ramacher <sramacher at debian.org>
++Date: Thu, 14 Jul 2016 23:01:01 +0200
++Subject: Use local intersphinx mappings
++
++Patch-Name: intersphinx.patch
++---
++ doc/en/conf.py | 15 +++++++++++----
++ 1 file changed, 11 insertions(+), 4 deletions(-)
++
++diff --git a/doc/en/conf.py b/doc/en/conf.py
++index aca0442..f0eab9c 100644
++--- a/doc/en/conf.py
+++++ b/doc/en/conf.py
++@@ -312,11 +312,18 @@ texinfo_documents = [
++ ]
++ 
++ 
++-# Example configuration for intersphinx: refer to the Python standard library.
++-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
++-#                       'lib': ("http://docs.python.org/2.7library/", None),
++-                    }
+++def check_object_path(key, url, path):
+++    if os.path.isfile(path):
+++        return {key: (url, path)}
+++    return {}
++ 
+++# Example configuration for intersphinx: refer to the Python standard library.
+++intersphinx_mapping = {}
+++intersphinx_mapping.update(
+++    check_object_path('python',
+++                      'http://docs.python.org/',
+++                      '/usr/share/doc/python%d.%d/html/objects.inv' % \
+++                       sys.version_info[:2]))
++ 
++ def setup(app):
++     #from sphinx.ext.autodoc import cut_lines
diff --cc debian/patches/series
index 0150aca,0000000..49cd64a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +remove_google_js
 +drop-entrypoint-logic.patch
++intersphinx.patch

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