[SCM] hdf5 branch, master, updated. upstream/1.8.8-16-ga88fc8e

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 65670a8dff8cbff26f781d4df9adcdd520e42984
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Wed Jan 18 15:11:55 2012 +0100

    Fix an upstream wrong assumption that ia64 => ifort as Fortran compiler. Should fix ia64 (and maybe sparc) FTBFS.

diff --git a/debian/changelog b/debian/changelog
index 7730b5f..8271bfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-hdf5 (1.8.8-2) UNRELEASED; urgency=low
+hdf5 (1.8.8-2) unstable; urgency=low
 
-  * Fix an upstream wrong assumption that ia64 => ifort as Fortran compiler
-    Should fix both ia64 and sparc FTBFS
+  * Fix an upstream wrong assumption that ia64 => ifort as
+    Fortran compiler.
+    Should fix ia64 (and maybe sparc) FTBFS.
   * Add a transitionnal package libhdf5-serial-dev => libhdf5-dev
   * libhdf5-mpich2-dev was depending on libmpich21.0-dev (should instead depend
     on libmpich2-dev)
diff --git a/debian/patches/series b/debian/patches/series
index 6ceccb5..81edb28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 mpi.diff
 path_max.diff
 ullong_force.diff
+
diff --git a/debian/rules b/debian/rules
index f3eb138..cc60a12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,7 +114,7 @@ configure-stamp: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build
 # configure serial version
-	cd debian/build && FC="gfortran" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
+	cd debian/build && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" FC=gfortran \
 		../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) 
 	touch $@
 
@@ -122,8 +122,8 @@ configure-stamp-openmpi: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build-openmpi
 # configure version with openmpi
-	cd debian/build-openmpi && FC="gfortran" CPPFLAGS=-I/usr/lib/openmpi/include CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
-		CC=mpicc.openmpi F9X=mpif90.openmpi RUNPARALLEL=/usr/bin/mpirun.openmpi \
+	cd debian/build-openmpi && CPPFLAGS=-I/usr/lib/openmpi/include CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
+		CC=mpicc.openmpi FC=mpif90.openmpi F9X=mpif90.openmpi RUNPARALLEL=/usr/bin/mpirun.openmpi \
 		OMPI_MCA_disable_memory_allocator=1 ../../configure $(CONFIGURE_FLAGS) --enable-fortran \
 		--enable-parallel=yes
 	touch $@
@@ -132,9 +132,9 @@ configure-stamp-mpich2: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build-mpich2
 # configure version with mpich2
-	cd debian/build-mpich2 && FC="gfortran" FCFLAGS=-I/usr/lib/mpich2/include/ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
+	cd debian/build-mpich2 && FCFLAGS=-I/usr/lib/mpich2/include/ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
 		LDFLAGS=-L/usr/lib/mpich2/lib/ CC=mpicc.mpich2 \
-		CXX=mpicxx.mpich2 F9X=mpif90.mpich2 RUNPARALLEL=/usr/bin/mpirun.mpich2 \
+		CXX=mpicxx.mpich2 FC=mpif90.mpich2 F9X=mpif90.mpich2 RUNPARALLEL=/usr/bin/mpirun.mpich2 \
 		../../configure $(CONFIGURE_FLAGS) --enable-fortran \
 		--enable-parallel=yes
 	touch $@

-- 
Hierarchical Data Format 5 (HDF5)