[Python-modules-commits] [cf-python] 15/16: merge patched into master
Klaus Zimmermann
zklaus-guest at moszumanska.debian.org
Tue Sep 13 06:47:54 UTC 2016
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 3bfb7875a1541d3c67b0d1e404cdd9e3590a3184
Merge: 3244630 53503e8
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date: Mon Sep 12 15:21:35 2016 +0200
merge patched into master
debian/.git-dpm | 4 +-
... => 0001-Remove-check-for-python-version.patch} | 2 +-
...-bundled-versions-of-javascript-libraries.patch | 11383 -------------------
...atch => 0002-Added-stripping-of-type-lib.patch} | 2 +-
...-config-to-avoid-network-access-and-add-.patch} | 2 +-
debian/patches/series | 7 +-
docs/build/_static/jquery-1.11.1.js | 10308 +++++++++++++++++
docs/build/_static/jquery.js | 4 +
docs/build/_static/underscore-1.3.1.js | 999 ++
docs/build/_static/underscore.js | 31 +
10 files changed, 11350 insertions(+), 11392 deletions(-)
diff --cc debian/.git-dpm
index f729d22,0000000..2f8aa57
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
- 17bf0b335bb4405cff2f2cb918120eaf98a5b2e9
- 17bf0b335bb4405cff2f2cb918120eaf98a5b2e9
++53503e8fc1d6c938b63d6e7ee5491b4432c77458
++53503e8fc1d6c938b63d6e7ee5491b4432c77458
+491059d8cce8b9d99f278cee9b0b7456eeca5376
+491059d8cce8b9d99f278cee9b0b7456eeca5376
+cf-python_1.3.1.orig.tar.gz
+f6fe89573e745e213948dac56a64454da38bf3c4
+3953807
diff --cc debian/patches/0001-Remove-check-for-python-version.patch
index 47bd274,0000000..8ea11ca
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-check-for-python-version.patch
+++ b/debian/patches/0001-Remove-check-for-python-version.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 87006e95faab3c46ce2b55e90290b27c0e972062 Mon Sep 17 00:00:00 2001
++From 905bd079a32be21c12d0c9b7d29468f7f55f81e2 Mon Sep 17 00:00:00 2001
+From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+Date: Thu, 18 Aug 2016 20:17:22 +0200
+Subject: Remove check for python version.
+
+The python version in sid at the moment is 2.7.12+.
+The + breaks the check, which is superfluous in any case, since
+the python2 version is guaranteed to be 2.7 anyway.
+
+Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+---
+ cf/__init__.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cf/__init__.py b/cf/__init__.py
+index 46a8b5f..65d0b96 100644
+--- a/cf/__init__.py
++++ b/cf/__init__.py
+@@ -58,12 +58,12 @@ import imp
+ import platform
+
+ # Check the version of python
+-if not (StrictVersion('2.6.0')
+- <= StrictVersion(platform.python_version())
+- < StrictVersion('3.0.0')):
+- raise ValueError(
+- "Bad python version: cf requires 2.6 <= python < 3.0. Got %s" %
+- platform.python_version())
++# if not (StrictVersion('2.6.0')
++# <= StrictVersion(platform.python_version())
++# < StrictVersion('3.0.0')):
++# raise ValueError(
++# "Bad python version: cf requires 2.6 <= python < 3.0. Got %s" %
++# platform.python_version())
+
+ ## Check the version of numpy
+ #import numpy
diff --cc debian/patches/0002-Added-stripping-of-type-lib.patch
index d92a666,0000000..49edfbb
mode 100644,000000..100644
--- a/debian/patches/0002-Added-stripping-of-type-lib.patch
+++ b/debian/patches/0002-Added-stripping-of-type-lib.patch
@@@ -1,19 -1,0 +1,19 @@@
- From 9891055aeb79c7d82ac6475dc1181d95c2fe32f0 Mon Sep 17 00:00:00 2001
++From fee13b458fe9067c3c4d1635fc89eea296233e7a Mon Sep 17 00:00:00 2001
+From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+Date: Fri, 9 Sep 2016 14:27:24 +0200
+Subject: Added stripping of type-lib.
+
+Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+---
+ cf/um/umread/c-lib/type-dep/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cf/um/umread/c-lib/type-dep/Makefile b/cf/um/umread/c-lib/type-dep/Makefile
+index 381c4a8..6052a5e 100644
+--- a/cf/um/umread/c-lib/type-dep/Makefile
++++ b/cf/um/umread/c-lib/type-dep/Makefile
+@@ -45,3 +45,4 @@ $(REDEFINES_DBL): $(DBL_TMP_OBJS)
+ $(LIB): $(OBJS)
+ rm -f $@
+ ar r $@ $(OBJS)
++ strip --remove-section=.comment --remove-section=.note --enable-deterministic-archives $@
diff --cc debian/patches/0003-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
index d6b2870,0000000..78ddba6
mode 100644,000000..100644
--- a/debian/patches/0003-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
+++ b/debian/patches/0003-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
@@@ -1,57 -1,0 +1,57 @@@
- From 17bf0b335bb4405cff2f2cb918120eaf98a5b2e9 Mon Sep 17 00:00:00 2001
++From 53503e8fc1d6c938b63d6e7ee5491b4432c77458 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 6d25fdb,0000000..0980737
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,3 @@@
- 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
++0001-Remove-check-for-python-version.patch
++0002-Added-stripping-of-type-lib.patch
++0003-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
More information about the Python-modules-commits
mailing list