[hdf5] 01/01: Use legacy library names in pkg-config files

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository hdf5.

commit d8b585ccdfab855828a27796c67efacd1609f574
Author: Gilles Filippini <pini at debian.org>
Date:   Sun Oct 5 20:59:55 2014 +0200

    Use legacy library names in pkg-config files
    
    to be consistent with h5cc & co.
---
 debian/changelog       | 7 +++++++
 debian/hdf5-mpich.pc   | 2 +-
 debian/hdf5-openmpi.pc | 2 +-
 debian/hdf5-serial.pc  | 2 +-
 debian/rules           | 9 ++++++---
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79821e3..7f16df9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.8.13+docs-14) unstable; urgency=medium
+
+  * Use legacy library names in pkg-config files, to be consistent with
+    h5cc & co.
+
+ -- Gilles Filippini <pini at debian.org>  Sun, 05 Oct 2014 20:57:39 +0200
+
 hdf5 (1.8.13+docs-13) unstable; urgency=medium
 
   * Revert libhdf5-mpi-dev to arch any, because the dependency depends
diff --git a/debian/hdf5-mpich.pc b/debian/hdf5-mpich.pc
index 7f80ea6..b624a76 100644
--- a/debian/hdf5-mpich.pc
+++ b/debian/hdf5-mpich.pc
@@ -3,4 +3,4 @@ Description: Hierarchical Data Format 5 (HDF5) - MPICH version
 Version: 1.8.13
 Requires: mpich
 Cflags: -I/usr/include/hdf5/mpich
-Libs: -lhdf5_mpich
+Libs: -L/usr/lib/@MULTIARCH@/hdf5/mpich -lhdf5
diff --git a/debian/hdf5-openmpi.pc b/debian/hdf5-openmpi.pc
index 69c3443..eeef1f6 100644
--- a/debian/hdf5-openmpi.pc
+++ b/debian/hdf5-openmpi.pc
@@ -3,4 +3,4 @@ Description: Hierarchical Data Format 5 (HDF5) - OpenMPI version
 Version: 1.8.13
 Requires:
 Cflags: -I/usr/include/openmpi -I/usr/include/hdf5/openmpi
-Libs: -lhdf5_openmpi -L/usr/lib/openmpi/lib -lmpi
+Libs: -L/usr/lib/@MULTIARCH@/hdf5/openmpi -lhdf5 -L/usr/lib/openmpi/lib -lmpi
diff --git a/debian/hdf5-serial.pc b/debian/hdf5-serial.pc
index df64a14..5974fb9 100644
--- a/debian/hdf5-serial.pc
+++ b/debian/hdf5-serial.pc
@@ -3,4 +3,4 @@ Description: Hierarchical Data Format 5 (HDF5)
 Version: 1.8.13
 Requires:
 Cflags: -I/usr/include/hdf5/serial
-Libs: -lhdf5_serial
+Libs: -L/usr/lib/@MULTIARCH@/hdf5/serial -lhdf5
diff --git a/debian/rules b/debian/rules
index cb8d4e4..a6e0427 100755
--- a/debian/rules
+++ b/debian/rules
@@ -240,7 +240,8 @@ install-serial: build-stamp
 	dh_install -p$(serpack) -p$(package)-dev -phdf5-helpers -phdf5-tools -p$(sercpppack) \
 		--sourcedir=debian/build/tmpinst
 	find debian/$(serpack)/usr/lib -name '*cpp*' -delete
-	install -m644 -D debian/hdf5-serial.pc debian/$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5-serial.pc
+	install -d debian/$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+	sed 's/@MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' debian/hdf5-serial.pc >debian/$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5-serial.pc
 
 install-openmpi: build-stamp-openmpi
 	dh_testdir
@@ -250,7 +251,8 @@ install-openmpi: build-stamp-openmpi
 	chrpath -d $(CURDIR)/debian/build-openmpi/tmpinst/usr/lib/*/libhdf5*so*
 	dh_install -p$(openmpipack) -p$(package)-openmpi-dev \
 		--sourcedir=debian/build-openmpi/tmpinst
-	install -m644 -D debian/hdf5-openmpi.pc debian/$(package)-openmpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5-openmpi.pc
+	install -d debian/$(package)-openmpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+	sed 's/@MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' debian/hdf5-openmpi.pc >debian/$(package)-openmpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5-openmpi.pc
 	cd debian/$(package)-openmpi-dev/usr/bin && \
 		mv h5pcc h5pcc.openmpi && \
 		mv h5pfc h5pfc.openmpi
@@ -263,7 +265,8 @@ install-mpich: build-stamp-mpich
 	chrpath -d $(CURDIR)/debian/build-mpich/tmpinst/usr/lib/*/libhdf5*so*
 	dh_install -p$(mpichpack) -p$(package)-mpich-dev \
 		--sourcedir=debian/build-mpich/tmpinst
-	install -m644 -D debian/hdf5-mpich.pc debian/$(package)-mpich-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5-mpich.pc
+	install -d debian/$(package)-mpich-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+	sed 's/@MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' debian/hdf5-mpich.pc >debian/$(package)-mpich-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5-mpich.pc
 	cd debian/$(package)-mpich-dev/usr/bin && \
 		mv h5pcc h5pcc.mpich && \
 		mv h5pfc h5pfc.mpich

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git