[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-69-g1e2d05b

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 54a7425b77284f644dc37b81a9f70793feb443f3
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Thu Aug 11 18:09:12 2011 +0200

    debian/rules: Some lam old commands removed

diff --git a/debian/rules b/debian/rules
index 7fc6f75..28f1a92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib//" | sed "s/Depends: //" | sed "s/-dev//" | sed "s/lam4/lam/")
+DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib//" | sed "s/Depends: //" | sed "s/-dev//")
 
 # To be used if binary packages were buildable on any arch
 #ARCH_FLAG=-a
@@ -92,19 +92,17 @@ CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
 		  --disable-sharedlib-rpath --with-zlib --with-default-api-version=v18
 SERIAL_ONLY_FLAGS = --enable-cxx --enable-fortran --enable-threadsafe 
 
-configure: configure-stamp-debian configure-stamp configure-stamp-lam \
+configure: configure-stamp-debian configure-stamp \
 	   $(configure_stamp_openmpi) configure-stamp-mpich2
 
 configure-stamp-debian: debian/control.in
 	cd debian && for i in *_devlib; do j=`basename $$i _devlib`; \
 		ln -sf $$i $(package)-dev.$$j ; \
-		ln -sf $$i $(package)-lam-dev.$$j ; \
 		ln -sf $$i $(package)-openmpi-dev.$$j ; \
 		ln -sf $$i $(package)-mpich2-dev.$$j ; \
 		done
 	cd debian && for i in *_shlib; do j=`basename $$i _shlib`; \
 		ln -sf $$i $(serpack).$$j ; \
-		ln -sf $$i $(lampack).$$j ; \
 		ln -sf $$i $(openmpipack).$$j ; \
 		ln -sf $$i $(mpich2pack).$$j ; \
 		done

-- 
Hierarchical Data Format 5 (HDF5)