[Python-modules-commits] [python-django-extra-views] 08/11: 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-extra-views.

commit 150af4637a10951a27ded99e3bb2ef6492eeb709
Merge: d507468 11daf9e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Mar 16 11:18:17 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...0001-Use-local-objects.inv-where-possible.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       | 18 ++++++++++-
 4 files changed, 55 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 8438a5c,0000000..4edbe35
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
- bf9f58450cc0a79d5d76cd24eba7fc6d72815255
- bf9f58450cc0a79d5d76cd24eba7fc6d72815255
++11daf9e2de3e9600c8ab664e0f26298a9e39d244
++11daf9e2de3e9600c8ab664e0f26298a9e39d244
 +bf9f58450cc0a79d5d76cd24eba7fc6d72815255
 +bf9f58450cc0a79d5d76cd24eba7fc6d72815255
 +python-django-extra-views_0.9.0.orig.tar.gz
 +838d610f7e590c64ae9bce619332e400da97cbc2
 +25744
diff --cc debian/patches/0001-Use-local-objects.inv-where-possible.patch
index 0000000,0000000..939379f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-local-objects.inv-where-possible.patch
@@@ -1,0 -1,0 +1,35 @@@
++From 11daf9e2de3e9600c8ab664e0f26298a9e39d244 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 16 Mar 2017 11:17:23 +0100
++Subject: Use local objects.inv where possible.
++
++---
++ docs/conf.py | 18 +++++++++++++++++-
++ 1 file changed, 17 insertions(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 01bf0f0..010c6e0 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -247,4 +247,20 @@ texinfo_documents = [
++ 
++ 
++ # Example configuration for intersphinx: refer to the Python standard library.
++-intersphinx_mapping = {'http://docs.python.org/': None}
+++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/{v}/'.format(
+++            v='.'.join(map(str, sys.version_info[:2]]))
+++        ),
+++        '/usr/share/doc/python{v}/html/objects.inv'.format(
+++            v='.'.join(map(str, sys.version_info[:2]]))
+++        )
+++    )
+++)
diff --cc debian/patches/series
index 0000000,0000000..693f90d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-local-objects.inv-where-possible.patch

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