[Python-modules-commits] [betamax] 05/09: merge patched into master

[Daniele Tricoli]

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

eriol-guest pushed a commit to branch master
in repository betamax.

commit 013db0dca310f618d1f68c24525b644f12f049dd
Merge: b3d014f a5e2a07
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Wed Jul 13 17:53:59 2016 +0200

    merge patched into master

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

diff --cc debian/.git-dpm
index 8c2ed64,0000000..813bdfb
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
- 36b432a680726f52fa78fcc2b7045aa30779cdac
- 36b432a680726f52fa78fcc2b7045aa30779cdac
++a5e2a0734253678e84b183762a0713e7f386e828
++a5e2a0734253678e84b183762a0713e7f386e828
 +36b432a680726f52fa78fcc2b7045aa30779cdac
 +36b432a680726f52fa78fcc2b7045aa30779cdac
 +betamax_0.7.1.orig.tar.gz
 +63ad1bd6bf048975564cf07dacb5c8921eb50adf
 +75952
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/local-intersphinx.patch
index 0000000,0000000..0c9441e
new file mode 100644
--- /dev/null
+++ b/debian/patches/local-intersphinx.patch
@@@ -1,0 -1,0 +1,27 @@@
++From a5e2a0734253678e84b183762a0713e7f386e828 Mon Sep 17 00:00:00 2001
++From: Daniele Tricoli <eriol at mornie.org>
++Date: Wed, 13 Jul 2016 17:51:57 +0200
++Subject: Use local python3-doc for intersphinx
++
++Patch-Name: local-intersphinx.patch
++---
++ docs/conf.py | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index b8a8d06..f28dabd 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -242,8 +242,8 @@ texinfo_appendices = []
++ 
++ # Intersphinx configuration
++ intersphinx_mapping = {
++-    'python': ('https://docs.python.org/3.4',
++-               (None, 'python-inv.txt')),
++-    'requests': ('http://docs.python-requests.org/en/latest',
++-                 (None, 'requests-inv.txt')),
+++    'python': ('/usr/share/doc/python3-doc/html', None),
+++    # requests doesn't ship docs in sdist.
+++    # 'requests': ('http://docs.python-requests.org/en/latest',
+++    #              (None, 'requests-inv.txt')),
++ }
diff --cc debian/patches/series
index 0000000,0000000..4d93b52
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++local-intersphinx.patch

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