[h5py] 04/09: merge patched into master

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository h5py.

commit c552e3ca75bc646569b9084a8ea125e9352884ca
Merge: a9cf69d 0be645c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Jan 25 09:03:19 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  6 +-
 debian/patches/0001-Disable-usage-of-rpath.patch   |  2 +-
 ...specify-endianess-of-expected-output-type.patch | 73 ----------------------
 debian/patches/series                              |  1 -
 docs/conf.py                                       |  4 +-
 h5py/h5r.pyx                                       |  2 +-
 h5py/h5t.pyx                                       | 35 +++++++++--
 h5py/tests/old/test_h5t.py                         |  3 +
 h5py/version.py                                    |  4 +-
 setup.py                                           |  2 +-
 10 files changed, 43 insertions(+), 89 deletions(-)

diff --cc debian/.git-dpm
index 00346c3,0000000..d215a18
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
- 345ac5c1626568307de6ecbad40f196db8c4d685
- 345ac5c1626568307de6ecbad40f196db8c4d685
- aa2d362fff97e9ab820932f646243c8b84377a05
++0be645c2ca05bc8100b45d0ae40663d064430053
++0be645c2ca05bc8100b45d0ae40663d064430053
++307ed5838b3a194864ed984f312c2f43315f18d4
 +307ed5838b3a194864ed984f312c2f43315f18d4
 +h5py_2.7.0~rc3.orig.tar.gz
 +9098edc50d89b086999c3e7a984a91266aa6a5ee
 +265017
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Disable-usage-of-rpath.patch
index a9cd80a,0000000..5552044
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 19fb129d7c046d9abb69c72277a54c1a1bc57ad9 Mon Sep 17 00:00:00 2001
++From 0be645c2ca05bc8100b45d0ae40663d064430053 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 876fdc3,0000000..1e2b1cb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +0001-Disable-usage-of-rpath.patch
- 0002-Explicity-specify-endianess-of-expected-output-type.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git