[adios] 188/207: WIP; fixes. Disable using NumPy1.7 API

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit c4a76b9bf6f85bf66c2b0ab2a60ac73c2e780a71
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun May 3 12:11:08 2015 +0100

    WIP; fixes. Disable using NumPy1.7 API
---
 debian/control | 1 +
 debian/rules   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 7e4f80a..cc0d1da 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9), libnetcdf-dev, gfortran, libhdf5-dev, libmxml-d
   libibverbs-dev [ !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
   python-dev, python-numpy, python-mpi4py, cython, dh-python,
   python3-all-dev, python3-numpy, python3-mpi4py, cython3
+Build-Conflicts: libadios-dev
 Standards-Version: 3.9.6
 Homepage: http://www.olcf.ornl.gov/center-projects/adios/
 X-Python-Version: 2.7
diff --git a/debian/rules b/debian/rules
index 3f59664..3fd02ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) $(WITH_IBVERBS) --enable-shared \
 		--with-hdf5-incdir=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
-		--with-hdf5-libdir=$(LIBDIR)/$(ARCH_DEFAULT_MPI_IMPL) \
+		--with-hdf5-libdir=$(LIBDIR)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-bzip2=/usr  --with-zlib=/usr \
 		--prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) # CFLAGS='-fPIC'
 

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