[hdf5] 23/24: Fixes for 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 08de0b32bed877d46e2d2b86cae6422e49158b14
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jun 4 12:15:45 2014 +0100

    Fixes for alternatives
---
 debian/libhdf5-flavor-dev.postinst.in | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/libhdf5-flavor-dev.postinst.in b/debian/libhdf5-flavor-dev.postinst.in
index 2909cfc..59d82e7 100644
--- a/debian/libhdf5-flavor-dev.postinst.in
+++ b/debian/libhdf5-flavor-dev.postinst.in
@@ -8,11 +8,10 @@ set -e
   update-alternatives \
 	--install /usr/bin/h5pcc h5pcc /usr/bin/h5pcc. at FLAVOR@ 50 \
 	--slave /usr/bin/h5pfc h5pfc /usr/bin/h5pfc. at FLAVOR@ \
-	--slave /usr/share/man/man1/h5pcc.1.gz h5pcc.1.gz /usr/share/man/man1/h5pcc. at FLAVOR@.1.gz \
-	--slave /usr/share/man/man1/h5pfc.1.gz h5pfc.1.gz /usr/share/man/man1/h5pfc. at FLAVOR@.1.gz 
- else 
-  update-alternatives \
-        --install ${LIB}/pkgconfig/hdf5-mpi.pc  	hdf5-mpi.pc  			${LIB}/pkgconfig/hdf5- at FLAVOR@.pc 50 \
+	--slave /usr/share/man/man1/h5pcc.1.gz 	h5pcc.1.gz 	/usr/share/man/man1/h5pcc. at FLAVOR@.1.gz \
+	--slave /usr/share/man/man1/h5pfc.1.gz 	h5pfc.1.gz 	/usr/share/man/man1/h5pfc. at FLAVOR@.1.gz  \
+        --slave ${LIB}/pkgconfig/hdf5-mpi.pc  	hdf5-mpi.pc  	${LIB}/pkgconfig/hdf5- at FLAVOR@.pc \
+        --slave ${LIB}/libhdf5_mpi.so                 libhdf5_mpi.so	 		${LIB}/libhdf5 at FLAVORLIB@.so.8.0.2  \
         --slave ${LIB}/libhdf5_mpi.so.8.0.2             libhdf5_mpi.so.8.0.2		${LIB}/libhdf5 at FLAVORLIB@.so.8.0.2 \
         --slave ${LIB}/libhdf5_mpi_hl.so.8.0.2          libhdf5_mpi_hl.so.8.0.2 	${LIB}/libhdf5 at FLAVORLIB@_hl.so.8.0.2 \
         --slave ${LIB}/libhdf5_mpi_fortran.so.8.0.2     libhdf5_mpi_fortran.so.8.0.2 	${LIB}/libhdf5 at FLAVORLIB@_fortran.so.8.0.2 \
@@ -21,14 +20,13 @@ 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 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 /usr/include/hdf5			hdf5				/usr/include/@FLAVOR@/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 \

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