[adios] 201/207: Use both serial and parallel HDF5

[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 e88d86bfde36de43852a25bcab3dbe66809cf5f7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat May 9 21:11:48 2015 +0100

    Use both serial and parallel HDF5
---
 debian/changelog | 3 ++-
 debian/control   | 4 ++--
 debian/rules     | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8cd4531..2539810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ adios (1.8.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Standards-Version: 3.9.6.	
+  * Work with both parallel and serial HDF5.
+  * Enable glib support
   * adios_config: Fix typo: pkgconfig -> pkg-config
-  * Use libglib2.0-dev
   * Move to cmake-3.2
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 08 Jan 2015 22:04:42 +0000
diff --git a/debian/control b/debian/control
index 0df12f8..4a94f6a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: adios
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 9), libnetcdf-dev, gfortran, libhdf5-dev, libmxml-dev, 
+Build-Depends: debhelper (>= 9), libnetcdf-dev, gfortran, libmxml-dev, 
   mpi-default-dev, autotools-dev, cmake, libbz2-dev, zlib1g-dev, dh-autoreconf,
   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,
-  libglib2.0-dev
+  libglib2.0-dev, libhdf5-serial-dev, libhdf5-mpi-dev
 Build-Conflicts: libadios-dev, libadios-bin
 Standards-Version: 3.9.6
 Homepage: http://www.olcf.ornl.gov/center-projects/adios/
diff --git a/debian/rules b/debian/rules
index a6b7937..c3d90a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,8 +74,10 @@ 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)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
+		--with-hdf5-incdir=/usr/include/hdf5/serial \
+		--with-hdf5-libdir=$(LIBDIR)/hdf5/serial \
+		--with-phdf5-incdir=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
+		--with-phdf5-libdir=$(LIBDIR)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr \
 		--prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS=-I$(LIBDIR)/glib-2.0/include
 

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