[h5py] 07/08: merge patched into master
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat Apr 8 15:05:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository h5py.
commit e2436cec819db827721959ad5f1192a28c3f7cff
Merge: 1a3f3b6 257d8b5
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Fri Apr 7 14:06:51 2017 +0100
merge patched into master
.gitignore | 23 --
.travis.yml | 84 -----
PKG-INFO | 45 +++
appveyor.yml | 103 ------
ci/appveyor/build.cmd | 21 --
ci/appveyor/vs2008_patch/readme.txt | 15 -
ci/appveyor/vs2008_patch/setup_x64.bat | 13 -
ci/appveyor/vs2008_patch/setup_x86.bat | 13 -
.../x64/600dd186-2429-11d7-8bf6-00b0d03daa06.reg | Bin 614 -> 0 bytes
.../x64/600dd187-2429-11d7-8bf6-00b0d03daa06.reg | Bin 606 -> 0 bytes
.../x64/600dd188-2429-11d7-8bf6-00b0d03daa06.reg | Bin 592 -> 0 bytes
.../x64/600dd189-2429-11d7-8bf6-00b0d03daa06.reg | Bin 612 -> 0 bytes
.../x64/656d875f-2429-11d7-8bf6-00b0d03daa06.reg | Bin 610 -> 0 bytes
.../x64/656d8760-2429-11d7-8bf6-00b0d03daa06.reg | Bin 596 -> 0 bytes
.../x64/656d8763-2429-11d7-8bf6-00b0d03daa06.reg | Bin 612 -> 0 bytes
.../x64/656d8766-2429-11d7-8bf6-00b0d03daa06.reg | Bin 616 -> 0 bytes
.../vs2008_patch/x64/VC_OBJECTS_PLATFORM_INFO.reg | Bin 3460 -> 0 bytes
.../x86/600dd186-2429-11d7-8bf6-00b0d03daa06.reg | Bin 578 -> 0 bytes
.../x86/600dd187-2429-11d7-8bf6-00b0d03daa06.reg | Bin 570 -> 0 bytes
.../x86/600dd188-2429-11d7-8bf6-00b0d03daa06.reg | Bin 556 -> 0 bytes
.../x86/600dd189-2429-11d7-8bf6-00b0d03daa06.reg | Bin 576 -> 0 bytes
.../x86/656d875f-2429-11d7-8bf6-00b0d03daa06.reg | Bin 574 -> 0 bytes
.../x86/656d8760-2429-11d7-8bf6-00b0d03daa06.reg | Bin 560 -> 0 bytes
.../x86/656d8763-2429-11d7-8bf6-00b0d03daa06.reg | Bin 576 -> 0 bytes
.../x86/656d8766-2429-11d7-8bf6-00b0d03daa06.reg | Bin 580 -> 0 bytes
.../vs2008_patch/x86/VC_OBJECTS_PLATFORM_INFO.reg | Bin 3340 -> 0 bytes
ci/fix_paths.py | 22 --
ci/get_hdf5.py | 134 --------
debian/.git-dpm | 6 +-
debian/patches/0001-Disable-usage-of-rpath.patch | 2 +-
.../patches/0002-Fix-arch-name-for-ppc64le.patch | 37 --
...version_tuple-to-make-it-PEP440-compliant.patch | 49 ---
debian/patches/series | 2 -
docs/conf.py | 2 +-
h5py.egg-info/PKG-INFO | 45 +++
h5py.egg-info/SOURCES.txt | 176 ++++++++++
h5py.egg-info/dependency_links.txt | 1 +
h5py.egg-info/requires.txt | 2 +
h5py.egg-info/top_level.txt | 1 +
h5py/version.py | 2 +-
other/garbage.py | 29 --
other/iterate_deadlock.py | 36 --
other/vlen_leak.py | 90 -----
pavement.py | 35 --
pylintrc | 377 ---------------------
setup.cfg | 5 +
setup.py | 2 +-
tox.ini | 62 ----
48 files changed, 282 insertions(+), 1152 deletions(-)
diff --cc debian/.git-dpm
index a9ddb68,0000000..6d04e62
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
- f5a5140861f88fc7086c81ea2d16812ac71a84fa
- f5a5140861f88fc7086c81ea2d16812ac71a84fa
- 307ed5838b3a194864ed984f312c2f43315f18d4
++257d8b5703cc56574aefca3d2ba96e94a861c5a1
++257d8b5703cc56574aefca3d2ba96e94a861c5a1
++f24f0d876ba340f1ccd9f8a589ab66e86cc964fe
+f24f0d876ba340f1ccd9f8a589ab66e86cc964fe
+h5py_2.7.0.orig.tar.gz
+1374dc279935d6b1360977f15900d8487738d12c
+256471
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Disable-usage-of-rpath.patch
index 5552044,0000000..4c01762
mode 100644,000000..100644
--- a/debian/patches/0001-Disable-usage-of-rpath.patch
+++ b/debian/patches/0001-Disable-usage-of-rpath.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 0be645c2ca05bc8100b45d0ae40663d064430053 Mon Sep 17 00:00:00 2001
++From 257d8b5703cc56574aefca3d2ba96e94a861c5a1 Mon Sep 17 00:00:00 2001
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 2 Feb 2016 10:56:16 +0000
+Subject: Disable usage of rpath.
+
+---
+ setup_build.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup_build.py b/setup_build.py
+index ffe19b7..ae4f2a3 100644
+--- a/setup_build.py
++++ b/setup_build.py
+@@ -104,8 +104,8 @@ class h5py_build_ext(build_ext):
+ settings['library_dirs'].insert(0, op.join(config.hdf5, 'lib'))
+
+ # TODO: should this only be done on UNIX?
+- if os.name != 'nt':
+- settings['runtime_library_dirs'] = settings['library_dirs']
++ #if os.name != 'nt':
++ #settings['runtime_library_dirs'] = settings['library_dirs']
+
+ def make_extension(module):
+ sources = [localpath('h5py', module+'.pyx')] + EXTRA_SRC.get(module, [])
diff --cc debian/patches/series
index 73882c2,0000000..1e2b1cb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
+0001-Disable-usage-of-rpath.patch
- 0002-Fix-arch-name-for-ppc64le.patch
- 0003-Fix-version_tuple-to-make-it-PEP440-compliant.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git
More information about the debian-science-commits
mailing list