[Python-modules-commits] [python-tornado] 02/03: 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-tornado.

commit 24e76e52adc38153807e559d38dc66475cc3cdbb
Merge: d56ffba a7a36e0
Author: Ondřej Nový <onovy at debian.org>
Date:   Wed Aug 3 19:03:26 2016 +0200

    merge patched into master

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

diff --cc debian/.git-dpm
index 774ba83,0000000..3d516a7
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
- dbc66934c194879655b92a64d7578a938faeb37d
- dbc66934c194879655b92a64d7578a938faeb37d
++a7a36e0c20aadbf8ad4dd91843660919913d39b1
++a7a36e0c20aadbf8ad4dd91843660919913d39b1
 +78b250c7a19799d2e1ccf68f36725ea2f61bff7b
 +78b250c7a19799d2e1ccf68f36725ea2f61bff7b
 +python-tornado_4.4.1.orig.tar.gz
 +74e6c017e073952febf4341d9d57b4876d2058c1
 +481547
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0007-Use-local-objects.inv-for-intersphinx-mapping.patch
index 0000000,0000000..04dc8b9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-Use-local-objects.inv-for-intersphinx-mapping.patch
@@@ -1,0 -1,0 +1,22 @@@
++From a7a36e0c20aadbf8ad4dd91843660919913d39b1 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Wed, 3 Aug 2016 19:02:48 +0200
++Subject: Use local objects.inv for intersphinx mapping
++
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index a12e7a4..54b55c2 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -93,7 +93,7 @@ extlinks = {
++     }
++ 
++ intersphinx_mapping = {
++-    'python': ('https://docs.python.org/3.5/', None),
+++    'python': ('/usr/share/doc/python3-doc/html', None),
++     }
++ 
++ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
diff --cc debian/patches/series
index 4fb1888,0000000..e98898d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +domain-test.patch
 +ignoreuserwarning.patch
 +skip-timing-tests.patch
 +sockopt.patch
 +without-certifi.patch
 +fix-ftbfs-on-hurd.patch
++0007-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-tornado.git