[h5py] 01/12: Cherry-pick upstream patch fixing HDF5 detection.

[Ghislain Vaillant]

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

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

commit 0aac982fa1ed3212cbb94d5c7f24701babf8a4a6
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Dec 1 10:53:53 2016 +0000

    Cherry-pick upstream patch fixing HDF5 detection.
    
    - New patch Package-Config-Fix-Detection.patch.
    
    Gbp-Dch: full
    Closes: #846351
    Thanks: Iain Lane for reporting
---
 debian/patches/Package-Config-Fix-Detection.patch | 35 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/Package-Config-Fix-Detection.patch b/debian/patches/Package-Config-Fix-Detection.patch
new file mode 100644
index 0000000..1bc6682
--- /dev/null
+++ b/debian/patches/Package-Config-Fix-Detection.patch
@@ -0,0 +1,35 @@
+From: Axel Huebl <axel.huebl at plasma.ninja>
+Date: Wed, 13 Jul 2016 10:02:15 +0200
+Subject: Package Config: Fix Detection
+
+Fix the detection of `pkgconfig` to avoid fallbacks to
+HDF `1.8.4` or non-detection on default installs on Ubuntu/Debian
+based systems.
+
+This is a fixed version of PR #707 by @asford with the feedback
+provided by @andreabedini.
+
+The main problem is the mismatch of `list`
+[append vs. extend](http://stackoverflow.com/questions/252703/append-vs-extend)
+:
+`pkgconfig.parse("hdf5")` returns a dictionary of `set`s of which we
+take the set of `library_dirs` which should be extending the libdirs
+list element-wise (and *not* "adding a `set` object to a list"
+via `append`).
+---
+ setup_configure.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup_configure.py b/setup_configure.py
+index fc7fb08..c670ff1 100644
+--- a/setup_configure.py
++++ b/setup_configure.py
+@@ -204,7 +204,7 @@ def autodetect_version(hdf5_dir=None):
+     libdirs = ['/usr/local/lib', '/opt/local/lib']
+     try:
+         if pkgconfig.exists("hdf5"):
+-            libdirs.append(pkgconfig.parse("hdf5")['library_dirs'])
++            libdirs.extend(pkgconfig.parse("hdf5")['library_dirs'])
+     except EnvironmentError:
+         pass
+     if hdf5_dir is not None:
diff --git a/debian/patches/series b/debian/patches/series
index f0fb0c6..b66b47c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Disable-usage-of-rpath.patch
 Disable-broken-tests.patch
+Package-Config-Fix-Detection.patch

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