[Python-modules-commits] [python-django-etcd-settings] 09/14: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-django-etcd-settings.

commit 975033fe95104fcf05a0744f6649bea4cabb04aa
Merge: a822b6d dddda32
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Dec 14 10:05:14 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...e-local-objects.inv-files-for-intersphinx.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       | 27 ++++++++---
 4 files changed, 76 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index be8e067,0000000..e6d5620
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 4eef2d2b78fa51a284f43aa2145425ba8636e4d3
- 4eef2d2b78fa51a284f43aa2145425ba8636e4d3
++dddda3230bedb458533a039b4c5e546aac81287d
++dddda3230bedb458533a039b4c5e546aac81287d
 +8f621f963901bc060b322d52b9033ba29d618fae
 +8f621f963901bc060b322d52b9033ba29d618fae
 +python-django-etcd-settings_0.1.11+dfsg.orig.tar.gz
 +7417d0c665a0d29025de15da71ab2b723cc109bc
 +21439
diff --cc debian/patches/0004-Use-local-objects.inv-files-for-intersphinx.patch
index 0000000,0000000..de66d4f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Use-local-objects.inv-files-for-intersphinx.patch
@@@ -1,0 -1,0 +1,52 @@@
++From dddda3230bedb458533a039b4c5e546aac81287d Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 14 Dec 2016 10:04:52 +0100
++Subject: Use local objects.inv files for intersphinx.
++
++---
++ docs/conf.py | 27 +++++++++++++++++++++------
++ 1 file changed, 21 insertions(+), 6 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index df0fd8e..bdd5eac 100755
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -16,6 +16,8 @@ import sys
++ import os
++ import shlex
++ 
+++import django
+++
++ # 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.
++@@ -299,10 +301,23 @@ texinfo_documents = [
++ 
++ 
++ # Example configuration for intersphinx: refer to the Python standard library.
++-intersphinx_mapping = {
++-    'https://docs.python.org/': None,
++-    'django': (
++-        'http://docs.djangoproject.com/en/1.8/',
++-        'http://docs.djangoproject.com/en/1.8/_objects/'
+++def check_object_path(key, url, path):
+++    if os.path.isfile(path):
+++        return {key: (url, path)}
+++    return {}
+++
+++intersphinx_mapping = {}
+++intersphinx_mapping.update(
+++    check_object_path(
+++        'python',
+++        'http://docs.python.org/',
+++        '/usr/share/doc/python' + '.'.join([str(x) for x in sys.version_info[0:2]]) + '/html/objects.inv'
++     )
++-}
+++)
+++intersphinx_mapping.update(
+++    check_object_path(
+++        'django',
+++        'https://docs.djangoproject.com/en/' + django.get_version() + '/',
+++        '/usr/share/doc/python-django-doc/html/objects.inv'
+++    )
+++)
diff --cc debian/patches/series
index 8df5dc1,0000000..0f79694
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch
 +0002-Use-packaged-plantuml.jar-file-for-sphinx.patch
 +0003-Use-packaged-MathJax.js-for-sphinx.patch
++0004-Use-local-objects.inv-files-for-intersphinx.patch

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