[Python-modules-commits] [python-simpy] 02/04: merge patched into master

[Ondřej Nový]

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

onovy pushed a commit to branch master
in repository python-simpy.

commit b8b22f634772df82555ff9c03cc78bb5b71a108c
Merge: f7fc946 777e2c9
Author: Ondřej Nový <onovy at debian.org>
Date:   Sun Aug 7 13:08:40 2016 +0200

    merge patched into master

 debian/.git-dpm                                      |  4 ++--
 ...e-local-objects.inv-for-intersphinx-mapping.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 docs/source/conf.py                                  |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 6a35873,0000000..e40255e
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
- 60c835e5d5f3cfce99e8160809b27bab2a663bf1
- 60c835e5d5f3cfce99e8160809b27bab2a663bf1
++777e2c9b3bab64fe2824669c41bfe3a63f53a32f
++777e2c9b3bab64fe2824669c41bfe3a63f53a32f
 +d52557c75d3ca2021e8c3eec814c9da383c03cc9
 +d52557c75d3ca2021e8c3eec814c9da383c03cc9
 +python-simpy_2.3.1.orig.tar.gz
 +686844ad7292fae7fa7c3f2906b37d3b2c0556eb
 +6296235
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Use-local-objects.inv-for-intersphinx-mapping.patch
index 0000000,0000000..358d813
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Use-local-objects.inv-for-intersphinx-mapping.patch
@@@ -1,0 -1,0 +1,20 @@@
++From 777e2c9b3bab64fe2824669c41bfe3a63f53a32f Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Sun, 7 Aug 2016 13:08:33 +0200
++Subject: Use local objects.inv for intersphinx mapping
++
++---
++ docs/source/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/source/conf.py b/docs/source/conf.py
++index 9b06809..bef864c 100644
++--- a/docs/source/conf.py
+++++ b/docs/source/conf.py
++@@ -234,5 +234,5 @@ man_pages = [
++ 
++ # Example configuration for intersphinx: refer to the Python standard library.
++ intersphinx_mapping = {
++-    'http://docs.python.org/': None,
+++    'python': ('/usr/share/doc/python3-doc/html', None),
++ }
diff --cc debian/patches/series
index 083347e,0000000..7f52762
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-fix-sphinxdoc.patch
 +0002-fix-README.txt-encoding.patch
++0003-Use-local-objects.inv-for-intersphinx-mapping.patch

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