[Python-modules-commits] [django-polymorphic] 09/15: 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 django-polymorphic.

commit b9cc4abc76f6facac429706fbf1e82882c49ddc0
Merge: bf7a7e5 ba769cb
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Sep 12 08:32:29 2016 +0200

    merge patched into master

 debian/.git-dpm                                                | 6 +++---
 debian/patches/0001-use-local-objects.inv-where-possible.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 02432f5,0000000..63bdbc5
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
- 6a840ca84a4e6984818941d4ba0b75a6a4cf9c8f
- 6a840ca84a4e6984818941d4ba0b75a6a4cf9c8f
- ad969467f02701e13bdb4ad359c84cfcf72b621e
++ba769cbd0a7c663b33a371834f4cd4c29833f335
++ba769cbd0a7c663b33a371834f4cd4c29833f335
++ab5ab3d5cac21265c55bcf975332874c2a18f1e2
 +ab5ab3d5cac21265c55bcf975332874c2a18f1e2
 +django-polymorphic_1.0.1.orig.tar.gz
 +9fb1cd6b48e1372b9e350d27241b9b15cca5d70a
 +89538
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-local-objects.inv-where-possible.patch
index 7c1556d,0000000..926f4c1
mode 100644,000000..100644
--- a/debian/patches/0001-use-local-objects.inv-where-possible.patch
+++ b/debian/patches/0001-use-local-objects.inv-where-possible.patch
@@@ -1,39 -1,0 +1,39 @@@
- From 6a840ca84a4e6984818941d4ba0b75a6a4cf9c8f Mon Sep 17 00:00:00 2001
++From ba769cbd0a7c663b33a371834f4cd4c29833f335 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Sun, 21 Aug 2016 13:17:22 +0200
 +Subject: use local objects.inv where possible
 +
 +Upstream uses intersphinx mappings that fetch the objects.inv for python django
 +through HTTP from a remote host. Using the local objects.inv from python and
 +django enables the package to build without network connection.
 +---
 + docs/conf.py | 19 ++++++++++++++-----
 + 1 file changed, 14 insertions(+), 5 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 6bada59..a5bb377 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -249,8 +249,17 @@ texinfo_documents = [
 + #texinfo_show_urls = 'footnote'
 + 
 + 
 +-# Example configuration for intersphinx: refer to the Python standard library.
 +-intersphinx_mapping = {
 +-    #'http://docs.python.org/': None,
 +-    'https://docs.djangoproject.com/en/dev': 'https://docs.djangoproject.com/en/dev/_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/dev',
 ++                                             '/usr/share/doc/python-django-doc/html/objects.inv'))

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