[Python-modules-commits] [python-attrs] 11/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 76c97e6b1efa962417f20c5191e9b325ccb961aa
Merge: 1433382 a1e2d3c
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Mon Oct 10 04:52:48 2016 +0200

    merge patched into master

 debian/.git-dpm                                                     | 4 ++--
 .../0001-Point-intersphinx_mapping-at-local-Python-docs.patch       | 6 +++---
 .../patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch  | 4 ++--
 docs/conf.py                                                        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index d87b7dd,0000000..0770a7d
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
- f3e629e9b8f36869592086e85ad1d5ee294a73ef
- f3e629e9b8f36869592086e85ad1d5ee294a73ef
++a1e2d3c98dbc1fb1f3c5557124ebd72c67913b42
++a1e2d3c98dbc1fb1f3c5557124ebd72c67913b42
 +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 2e87cb8,0000000..da7bfb5
mode 100644,000000..100644
--- a/debian/patches/0001-Point-intersphinx_mapping-at-local-Python-docs.patch
+++ b/debian/patches/0001-Point-intersphinx_mapping-at-local-Python-docs.patch
@@@ -1,20 -1,0 +1,20 @@@
- From d122a2c17dd09a713f59a73a1b2b035aec93a825 Mon Sep 17 00:00:00 2001
++From 0fa216d9a6f9f32de524883c34bf32bfa0e6a3a4 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
++index dbfdf36..2ff5f66 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')
+++    'python': ('/usr/share/doc/python3-doc/html', '/usr/share/doc/python3-doc/html/objects.inv')
 + }
diff --cc debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
index 5c860dc,0000000..b939c94
mode 100644,000000..100644
--- a/debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
+++ b/debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
@@@ -1,23 -1,0 +1,23 @@@
- From f3e629e9b8f36869592086e85ad1d5ee294a73ef Mon Sep 17 00:00:00 2001
++From a1e2d3c98dbc1fb1f3c5557124ebd72c67913b42 Mon Sep 17 00:00:00 2001
 +From: Tristan Seligmann <mithrandi at mithrandi.net>
 +Date: Mon, 10 Oct 2016 04:42:22 +0200
 +Subject: Add build directory to sys.path for autodoc.
 +
 +---
 + docs/conf.py | 3 ++-
 + 1 file changed, 2 insertions(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index bcff855..6c4ea71 100644
++index 2ff5f66..640dd9e 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -47,7 +47,8 @@ def find_version(*file_paths):
 + # If extensions (or modules to document with autodoc) are in another directory,
 + # add these directories to sys.path here. If the directory is relative to the
 + # documentation root, use os.path.abspath to make it absolute, like shown here.
 +-#sys.path.insert(0, os.path.abspath('.'))
 ++import sys
 ++sys.path.insert(0, os.path.abspath('../.pybuild/pythonX.Y_3.5/build'))
 + 
 + # -- General configuration ------------------------------------------------
 + 

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