[SCM] hdf5 branch, master, updated. upstream/1.8.7-171-g5b80ac3

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 5b80ac36d324ce3f7e39a84141e42d92be1f5c50
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Sat Sep 28 18:55:42 2013 +0200

    Remove rpath

diff --git a/debian/changelog b/debian/changelog
index 08e6763..9e1d68e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hdf5 (1.8.11-4) unstable; urgency=low
 
   * Fix a miscompilation issue with gcc 4.8 (Closes: #721805)
   * Rebuild to fix the mod gfortran issue (Closes: #687127)
+  * Remove rpath
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 28 Sep 2013 16:11:34 +0200
 
diff --git a/debian/control b/debian/control
index e5352a2..c1adb05 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Build-Depends: dpkg-dev (>= 1.16.1~), libmpich2-dev, zlib1g-dev,
  libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5),
  gfortran, libibverbs-dev [!arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils, mpi-default-dev
+ sharutils, mpi-default-dev, chrpath
 Standards-Version: 3.9.4
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git
diff --git a/debian/rules b/debian/rules
index 9751848..40e4764 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ build_stamp_openmpi = build-stamp-openmpi
 install_openmpi = install-openmpi
 else
 configure_stamp_openmpi =
-build_stamp_openmpi = 
+build_stamp_openmpi =
 install_openmpi =
 endif
 
@@ -187,11 +187,12 @@ clean:
 
 install: build prep install-serial $(install_openmpi) install-mpich2 install-doc
 
-install-serial: build-stamp 
+install-serial: build-stamp
 	dh_testdir
 	dh_testroot
 	-mkdir debian/build/tmpinst
 	$(MAKE) -C debian/build/ install prefix=$(CURDIR)/debian/build/tmpinst/usr
+	chrpath -d debian/build/tmpinst/usr/lib/*libhdf5*
 	dh_install -p$(serpack) -p$(package)-dev -phdf5-helpers -phdf5-tools \
 		--sourcedir=debian/build/tmpinst
 
@@ -200,6 +201,7 @@ install-openmpi: build-stamp-openmpi
 	dh_testroot
 	-mkdir debian/build-openmpi/tmpinst
 	$(MAKE) -C debian/build-openmpi/ install prefix=$(CURDIR)/debian/build-openmpi/tmpinst/usr
+	chrpath -d debian/build-openmpi/tmpinst/usr/lib/*libhdf5*
 	dh_install -p$(openmpipack) -p$(package)-openmpi-dev \
 		--sourcedir=debian/build-openmpi/tmpinst
 
@@ -208,6 +210,7 @@ install-mpich2: build-stamp-mpich2
 	dh_testroot
 	-mkdir debian/build-mpich2/tmpinst
 	$(MAKE) -C debian/build-mpich2/ install prefix=$(CURDIR)/debian/build-mpich2/tmpinst/usr
+	chrpath -d debian/build-mpich2/tmpinst/usr/lib/*libhdf5*
 	dh_install -p$(mpich2pack) -p$(package)-mpich2-dev \
 		--sourcedir=debian/build-mpich2/tmpinst
 
@@ -231,7 +234,7 @@ binary-indep: install-doc
 
 binary-arch: prep install-serial $(install_openmpi) install-mpich2
 	dh_testdir
-	dh_testroot 
+	dh_testroot
 	echo "hdf5-mpi-dev=libhdf5-$(DEFAULT_MPI)-dev" > debian/libhdf5-mpi-dev.substvars
 	dh_installdocs $(ARCH_FLAG)
 	dh_installman $(ARCH_FLAG)

-- 
Hierarchical Data Format 5 (HDF5)