[hdf5] 04/08: Fix shlibs

[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 5b81ed6f298ab9a0f923188c5d0170c16be9e929
Author: Gilles Filippini <pini at debian.org>
Date:   Sun Jul 6 09:51:18 2014 +0200

    Fix shlibs
---
 debian/libhdf5-8.lintian-overrides         | 2 ++
 debian/libhdf5-flavor-soname.shlibs.in     | 8 ++++----
 debian/libhdf5-mpich-8.lintian-overrides   | 2 +-
 debian/libhdf5-openmpi-8.lintian-overrides | 2 +-
 debian/rules                               | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/libhdf5-8.lintian-overrides b/debian/libhdf5-8.lintian-overrides
new file mode 100644
index 0000000..f578a78
--- /dev/null
+++ b/debian/libhdf5-8.lintian-overrides
@@ -0,0 +1,2 @@
+libhdf5-8: package-name-doesnt-match-sonames libhdf5-serial8 libhdf5-serial-fortran8 libhdf5-serial-hl8 libhdf5-serialhl-fortran8
+
diff --git a/debian/libhdf5-flavor-soname.shlibs.in b/debian/libhdf5-flavor-soname.shlibs.in
index 2911769..486801d 100644
--- a/debian/libhdf5-flavor-soname.shlibs.in
+++ b/debian/libhdf5-flavor-soname.shlibs.in
@@ -1,5 +1,5 @@
-libhdf5_fortran @SONAME@ libhdf5- at SONAME@
-libhdf5 @SONAME@ libhdf5- at SONAME@ | libhdf5-openmpi- at SONAME@ | libhdf5-mpich- at SONAME@
-libhdf5_hl @SONAME@ libhdf5- at SONAME@ | libhdf5-openmpi- at SONAME@ | libhdf5-mpich- at SONAME@
-libhdf5hl_fortran @SONAME@ libhdf5- at SONAME@ | libhdf5-openmpi- at SONAME@ | libhdf5-mpich- at SONAME@
+libhdf5 at FLAVORLIB@_fortran @SONAME@ libhdf5 at FLAVORPKG@- at SONAME@
+libhdf5 at FLAVORLIB@ @SONAME@ libhdf5 at FLAVORPKG@- at SONAME@
+libhdf5 at FLAVORLIB@_hl @SONAME@ libhdf5 at FLAVORPKG@- at SONAME@
+libhdf5 at FLAVORLIB@hl_fortran @SONAME@ libhdf5 at FLAVORPKG@- at SONAME@
 
diff --git a/debian/libhdf5-mpich-8.lintian-overrides b/debian/libhdf5-mpich-8.lintian-overrides
index 6d85232..41da5fa 100644
--- a/debian/libhdf5-mpich-8.lintian-overrides
+++ b/debian/libhdf5-mpich-8.lintian-overrides
@@ -1,2 +1,2 @@
-libhdf5-mpich-8: package-name-doesnt-match-sonames libhdf5-8 libhdf5-fortran8 libhdf5-hl8 libhdf5hl-fortran8
+libhdf5-mpich-8: package-name-doesnt-match-sonames libhdf5-mpich8 libhdf5-mpich-fortran8 libhdf5-mpich-hl8 libhdf5-mpichhl-fortran8
 
diff --git a/debian/libhdf5-openmpi-8.lintian-overrides b/debian/libhdf5-openmpi-8.lintian-overrides
index 0a71140..5f53c72 100644
--- a/debian/libhdf5-openmpi-8.lintian-overrides
+++ b/debian/libhdf5-openmpi-8.lintian-overrides
@@ -1,2 +1,2 @@
-libhdf5-openmpi-8: package-name-doesnt-match-sonames libhdf5-8 libhdf5-fortran8 libhdf5-hl8 libhdf5hl-fortran8
+libhdf5-openmpi-8: package-name-doesnt-match-sonames libhdf5-openmpi8 libhdf5-openmpi-fortran8 libhdf5-openmpi-hl8 libhdf5-openmpihl-fortran8
 
diff --git a/debian/rules b/debian/rules
index d7ec848..eae4870 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ configure-stamp-debian: debian/control.in
 	    flavorlibstr="" ; \
 	    ifmpi="#"; \
 	    if [ "$$flavor" != "serial" ]; then \
-	      if echo "$$helper" | grep -Eq '\-cpp|\.shlibs'; then \
+	      if echo "$$helper" | grep -Eq '\-cpp'; then \
 	        continue ; \
 	      fi ; \
 	      flavorpkgstr="-$$flavor" ; \

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