[Python-modules-commits] [cf-python] 10/16: merge patched into master

[Klaus Zimmermann]

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

zklaus-guest pushed a commit to branch master
in repository cf-python.

commit 854efe0cbe2a1030e68fe8d3fc3a01f7551c1358
Merge: a7a4e67 17bf0b3
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date:   Mon Sep 12 13:56:17 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...x-config-to-avoid-network-access-and-add-.patch | 57 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/source/conf.py                                | 28 ++++++++++-
 4 files changed, 86 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 1a77720,0000000..f729d22
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
- 9891055aeb79c7d82ac6475dc1181d95c2fe32f0
- 9891055aeb79c7d82ac6475dc1181d95c2fe32f0
++17bf0b335bb4405cff2f2cb918120eaf98a5b2e9
++17bf0b335bb4405cff2f2cb918120eaf98a5b2e9
 +491059d8cce8b9d99f278cee9b0b7456eeca5376
 +491059d8cce8b9d99f278cee9b0b7456eeca5376
 +cf-python_1.3.1.orig.tar.gz
 +f6fe89573e745e213948dac56a64454da38bf3c4
 +3953807
diff --cc debian/patches/0004-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
index 0000000,0000000..d6b2870
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
@@@ -1,0 -1,0 +1,57 @@@
++From 17bf0b335bb4405cff2f2cb918120eaf98a5b2e9 Mon Sep 17 00:00:00 2001
++From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
++Date: Mon, 12 Sep 2016 13:55:20 +0200
++Subject: Patch sphinx config to avoid network access and add local intersphinx
++ links.
++
++Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
++---
++ docs/source/conf.py | 28 ++++++++++++++++++++++++++--
++ 1 file changed, 26 insertions(+), 2 deletions(-)
++
++diff --git a/docs/source/conf.py b/docs/source/conf.py
++index 50084c5..55b02f9 100755
++--- a/docs/source/conf.py
+++++ b/docs/source/conf.py
++@@ -72,6 +72,30 @@ intersphinx_mapping = {
++     'scipy':      ('http://docs.scipy.org/doc/scipy/reference', None),
++     }
++ 
+++def check_object_path(key, url, path):
+++    if os.path.isfile(path):
+++        return {key: (url, path)}
+++    return {}
+++
+++intersphinx_mapping.update(check_object_path('sphinx',
+++                                             'http://sphinx.pocoo.org/',
+++                                             '/usr/share/doc/sphinx-doc/html/objects.inv'))
+++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('matplotlib',
+++                                             'http://matplotlib.sourceforge.net/',
+++                                             '/usr/share/doc/python-matplotlib-doc/html/objects.inv'))
+++intersphinx_mapping.update(check_object_path('numpy',
+++                                             'http://docs.scipy.org/doc/numpy/',
+++                                             '/usr/share/doc/python-numpy-doc/html/objects.inv'))
+++intersphinx_mapping.update(check_object_path('scipy',
+++                                             'http://docs.scipy.org/doc/scipy/',
+++                                             '/usr/share/doc/python-scipy-doc/html/objects.inv'))
+++
+++
++ # The name of the default domain. Can also be None to disable a
++ # default domain. The default is 'py'.
++ #primary_domain = 'cf'
++@@ -324,8 +348,8 @@ def linkcode_resolve(domain, info):
++     #=================================================================
++ 
++ 
++-    online_source_code = True
++-#    online_source_code = False
+++#    online_source_code = True
+++    online_source_code = False
++ 
++     if domain != 'py':
++         return None
diff --cc debian/patches/series
index 910577b,0000000..6d25fdb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +0001-Removed-bundled-versions-of-javascript-libraries.patch
 +0002-Remove-check-for-python-version.patch
 +0003-Added-stripping-of-type-lib.patch
++0004-Patch-sphinx-config-to-avoid-network-access-and-add-.patch

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