[Python-modules-commits] [python-attrs] 05/11: merge patched into master

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository python-attrs.

commit 01c19357a6373f366470fd47aa96ac2bf9b707a1
Merge: 846c504 d122a2c
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Mon Oct 10 04:40:46 2016 +0200

    merge patched into master

 debian/.git-dpm                                      |  4 ++--
 ...nt-intersphinx_mapping-at-local-Python-docs.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 docs/conf.py                                         |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index dc8e8c1,0000000..3953e3a
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
- 02ab5d9c3a881e4198d291bc7b69b58616faf533
- 02ab5d9c3a881e4198d291bc7b69b58616faf533
++d122a2c17dd09a713f59a73a1b2b035aec93a825
++d122a2c17dd09a713f59a73a1b2b035aec93a825
 +02ab5d9c3a881e4198d291bc7b69b58616faf533
 +02ab5d9c3a881e4198d291bc7b69b58616faf533
 +python-attrs_16.2.0.orig.tar.gz
 +c406dab4789ed7260fd2718037acb7ad039dcef4
 +49512
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Point-intersphinx_mapping-at-local-Python-docs.patch
index 0000000,0000000..2e87cb8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Point-intersphinx_mapping-at-local-Python-docs.patch
@@@ -1,0 -1,0 +1,20 @@@
++From d122a2c17dd09a713f59a73a1b2b035aec93a825 Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at mithrandi.net>
++Date: Mon, 10 Oct 2016 04:40:30 +0200
++Subject: Point intersphinx_mapping at local Python docs.
++
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index dbfdf36..bcff855 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -300,5 +300,5 @@ texinfo_documents = [
++ 
++ # Example configuration for intersphinx: refer to the Python standard library.
++ intersphinx_mapping = {
++-    "https://docs.python.org/3": None,
+++    'python': ('../../python3-doc/html', '/usr/share/doc/python3-doc/html/objects.inv')
++ }
diff --cc debian/patches/series
index 0000000,0000000..101b98b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Point-intersphinx_mapping-at-local-Python-docs.patch

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