[adios] 135/207: Use serial 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 23e3a5986e236178b4a4bc08896d648474b4cc0b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 22 09:08:40 2014 +0100

    Use serial HDF5
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1e0fd38..6f98eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 adios (1.6.0-5) UNRELEASED; urgency=medium
 
   * Don't depend on infiniband on hurd, kfreebsd-* 
+  * Build with serial HDF5 by default; building with mpicc.openmpi collides
+    with mpipublic.h internally.
   * Prime CMakeCache.txt with PYTHON_MPI4PY_INCLUDE_DIR so it is found
     on all archs to fix FTBFS. 
   * Add initial bash_completion.d completions.
diff --git a/debian/control b/debian/control
index ec054cb..477aece 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: adios
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 9), libnetcdf-dev, gfortran, libhdf5-mpi-dev | libhdf5-dev, libmxml-dev, 
+Build-Depends: debhelper (>= 9), libnetcdf-dev, gfortran, libhdf5-dev, libmxml-dev, 
   mpi-default-dev, autotools-dev, cmake, libbz2-dev, zlib1g-dev,
   libibverbs-dev [ !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
   python-dev, python-numpy, python3-mpi4py, cython, dh-python,

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