[hdf5] 19/24: Fixes in postinst update-alternatives

[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 fa11be84c4f6eed8085b50250a0c3d77b581145d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jun 4 09:02:20 2014 +0100

    Fixes in postinst update-alternatives
---
 debian/libhdf5-flavor-dev.postinst.in | 5 +++--
 debian/rules                          | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/libhdf5-flavor-dev.postinst.in b/debian/libhdf5-flavor-dev.postinst.in
index 585f10a..713da6f 100644
--- a/debian/libhdf5-flavor-dev.postinst.in
+++ b/debian/libhdf5-flavor-dev.postinst.in
@@ -21,13 +21,14 @@ set -e
         --slave ${LIB}/libhdf5_mpi_hl.so.8              libhdf5_mpi_hl.so.8		${LIB}/libhdf5 at FLAVORLIB@_hl.so.8.0.2 \
         --slave ${LIB}/libhdf5_mpi_fortran.so.8         libhdf5_mpi_fortran.so.8	${LIB}/libhdf5 at FLAVORLIB@_fortran.so.8.0.2 \
         --slave ${LIB}/libhdf5_mpi_hl_fortran.so.8      libhdf5_mpi_hl_fortran.so.8	${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2 \
-        --slave ${LIB}/libhdf5_mpi.so                   libhdf5_mpi.so	 		${LIB}/libhdf5- at FLAVOR@.so.8.0.2 \
+        --slave ${LIB}/libhdf5_mpi.so                   libhdf5_mpi.so	 		${LIB}/libhdf5 at FLAVORLIB@.so.8.0.2 \
         --slave ${LIB}/libhdf5_mpi_hl.so                libhdf5_mpi_hl.so 		${LIB}/libhdf5 at FLAVORLIB@_hl.so.8.0.2 \
         --slave ${LIB}/libhdf5_mpi_fortran.so           libhdf5_mpi_fortran.so		${LIB}/libhdf5 at FLAVORLIB@_fortran.so.8.0.2 \
         --slave ${LIB}/libhdf5_mpi_hl_fortran.so        libhdf5_mpi_hl_fortran.so	${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2
  fi
  update-alternatives \
 	--install ${LIB}/pkgconfig/hdf5.pc 		hdf5.pc	       			${LIB}/pkgconfig/hdf5- at FLAVOR@.pc 50 \
+	--slave /usr/include/hdf5			hdf5				/usr/include/@FLAVOUR@/hdf5 \
 	--slave ${LIB}/libhdf5.so.8.0.2	               	libhdf5.so.8.0.2		${LIB}/libhdf5 at FLAVORLIB@.so.8.0.2 \
 	--slave ${LIB}/libhdf5_hl.so.8.0.2              libhdf5_hl.so.8.0.2		${LIB}/libhdf5 at FLAVORLIB@_hl.so.8.0.2 \
 	--slave ${LIB}/libhdf5_fortran.so.8.0.2	        libhdf5_fortran.so.8.0.2	${LIB}/libhdf5 at FLAVORLIB@_fortran.so.8.0.2 \
@@ -38,7 +39,7 @@ set -e
 	--slave ${LIB}/libhdf5_hl_fortran.so.8	       	libhdf5_hl_fortran.so.8		${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2 \
         --slave ${LIB}/libhdf5.so                       libhdf5.so			${LIB}/libhdf5 at FLAVORLIB@.so.8.0.2 \
         --slave ${LIB}/libhdf5_hl.so                    libhdf5_hl.so			${LIB}/libhdf5 at FLAVORLIB@_hl.so.8.0.2 \
-        --slave ${LIB}/libhdf5_fortran.so               libhdf5_fortran.so		${LIB}/libhdf5 at FLAVORLIB@_fortran at so.8.0.2 \
+        --slave ${LIB}/libhdf5_fortran.so               libhdf5_fortran.so		${LIB}/libhdf5 at FLAVORLIB@_fortran.so.8.0.2 \
         --slave ${LIB}/libhdf5_hl_fortran.so            libhdf5_hl_fortran.so		${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 07ccaf3..71da1dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -223,6 +223,8 @@ install-serial: build-stamp
 	dh_testroot
 	-mkdir debian/build/tmpinst
 	$(MAKE) -C debian/build/ install prefix=$(CURDIR)/debian/build/tmpinst/usr
+	-mkdir -p debian/build/tmpinst/usr/include/serial/hdf5
+	mv debian/build/tmpinst/usr/include/*.h debian/build/tmpinst/usr/include/*.mod debian/build/tmpinst/usr/include/serial/hdf5
 	chrpath -d $(CURDIR)/debian/build/tmpinst/usr/lib/*/libhdf5*so*
 	dh_install -p$(serpack) -p$(package)-dev -phdf5-helpers -phdf5-tools -p$(sercpppack) \
 		--sourcedir=debian/build/tmpinst

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