[hdf5] 08/16: Need to create directory /hdf5/ before writing and chrpath

[Alastair McKinstry]

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

mckinstry pushed a commit to branch dev-alternatives
in repository hdf5.

commit 0654cb601936bb8b26b62e4089ee24aed4760e22
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jul 22 15:57:37 2014 +0100

    Need to create directory /hdf5/ before writing and chrpath
---
 debian/libhdf5-flavor-dev.install.in    | 2 +-
 debian/libhdf5-flavor-soname.install.in | 2 +-
 debian/make_bounce_libs.py              | 2 +-
 debian/rules                            | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/libhdf5-flavor-dev.install.in b/debian/libhdf5-flavor-dev.install.in
index f095b42..b194ba9 100644
--- a/debian/libhdf5-flavor-dev.install.in
+++ b/debian/libhdf5-flavor-dev.install.in
@@ -2,6 +2,6 @@ usr/include
 usr/lib/*/libhdf5 at FLAVORLIB@*.so
 usr/lib/*/libhdf5 at FLAVORLIB@*.settings
 usr/lib/*/libhdf5 at FLAVORLIB@*.a
-usr/lib/*/@FLAVOR@/*.so.*
+usr/lib/*/hdf5/@FLAVOR@/*.so.*
 @IFMPI at usr/bin/h5pcc
 @IFMPI at usr/bin/h5pfc
diff --git a/debian/libhdf5-flavor-soname.install.in b/debian/libhdf5-flavor-soname.install.in
index f2d9ac7..618272d 100644
--- a/debian/libhdf5-flavor-soname.install.in
+++ b/debian/libhdf5-flavor-soname.install.in
@@ -2,4 +2,4 @@ usr/lib/*/libhdf5 at FLAVORLIB@.so.*
 usr/lib/*/libhdf5 at FLAVORLIB@_hl.so.*
 usr/lib/*/libhdf5 at FLAVORLIB@_fortran.so.*
 usr/lib/*/libhdf5 at FLAVORLIB@hl_fortran.so.*
-usr/lib/*/@FLAVOR@/*.so.*
+usr/lib/*/hdf5/@FLAVOR@/*.so.*
diff --git a/debian/make_bounce_libs.py b/debian/make_bounce_libs.py
index 5f956af..c65fd95 100755
--- a/debian/make_bounce_libs.py
+++ b/debian/make_bounce_libs.py
@@ -180,7 +180,7 @@ dirname = 'debian/build%s/tmpinst/usr/lib/%s' % (flavorlib, multiarch)
 tmpdir = 'debian/tmp/%s' % flavor
 v = { 'serial' : 'serial', 'mpich' : 'mpi', 'openmpi' :'mpi'}
 sh('mkdir -p %s' % tmpdir)
-sh('mkdir -p %s/%s' % (dirname,flavor))
+sh('mkdir -p %s/hdf5/%s' % (dirname,flavor))
 
 for libsuffix in ['','_hl','_fortran','hl_fortran']:
     ver_filename = 'debian/libhdf5_%s%s.ver' % (v[flavor],libsuffix)
diff --git a/debian/rules b/debian/rules
index d4e60ed..c9dffdb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -229,7 +229,7 @@ install-serial: build-stamp
 	$(MAKE) -C debian/build/ install prefix=$(CURDIR)/debian/build/tmpinst/usr
 	./debian/make_bounce_libs.py 8 serial
 	chrpath -d $(CURDIR)/debian/build/tmpinst/usr/lib/*/libhdf5*so*
-	chrpath -d $(CURDIR)/debian/build/tmpinst/usr/lib/*/serial/libhdf5*so*
+	chrpath -d $(CURDIR)/debian/build/tmpinst/usr/lib/*/hdf5/serial/libhdf5*so*
 	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
@@ -242,7 +242,7 @@ install-openmpi: build-stamp-openmpi
 	$(MAKE) -C debian/build-openmpi/ install prefix=$(CURDIR)/debian/build-openmpi/tmpinst/usr
 	./debian/make_bounce_libs.py 8 openmpi
 	chrpath -d $(CURDIR)/debian/build-openmpi/tmpinst/usr/lib/*/libhdf5*so*
-	chrpath -d $(CURDIR)/debian/build-openmpi/tmpinst/usr/lib/*/openmpi/libhdf5*so*
+	chrpath -d $(CURDIR)/debian/build-openmpi/tmpinst/usr/lib/*/hdf5/openmpi/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
@@ -257,7 +257,7 @@ install-mpich: build-stamp-mpich
 	$(MAKE) -C debian/build-mpich/ install prefix=$(CURDIR)/debian/build-mpich/tmpinst/usr
 	./debian/make_bounce_libs.py 8 mpich
 	chrpath -d $(CURDIR)/debian/build-mpich/tmpinst/usr/lib/*/libhdf5*so*
-	chrpath -d $(CURDIR)/debian/build-mpich/tmpinst/usr/lib/*/mpich/libhdf5*so*
+	chrpath -d $(CURDIR)/debian/build-mpich/tmpinst/usr/lib/*/hdf5/mpich/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

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