[hdf5] 01/01: Back out libhdf5_hl_fortran name change
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Jun 12 12:35:38 UTC 2014
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-alternatives
in repository hdf5.
commit 008feb6bc52c4463ae6f19f188c345147daea11a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Jun 12 13:35:07 2014 +0100
Back out libhdf5_hl_fortran name change
---
debian/libhdf5-flavor-dev.links.in | 4 ++--
debian/libhdf5-flavor-dev.postinst.in | 15 ++++++---------
debian/libhdf5-flavor-soname.install.in | 2 +-
debian/libhdf5-flavor-soname.shlibs.in | 2 +-
debian/libhdf5-openmpi-8.symbols | 2 +-
debian/patches/flavor-configure-option.patch | 14 +++++++-------
debian/patches/version-script.patch | 6 +++---
7 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/debian/libhdf5-flavor-dev.links.in b/debian/libhdf5-flavor-dev.links.in
index faa54cb..4185222 100644
--- a/debian/libhdf5-flavor-dev.links.in
+++ b/debian/libhdf5-flavor-dev.links.in
@@ -1,9 +1,9 @@
@IFMPI at usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@.so usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5.so
@IFMPI at usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_fortran.so usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_fortran.so
@IFMPI at usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_hl.so usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_hl.so
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_hl_fortran.so usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_hl_fortran.so
+ at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@hl_fortran.so usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5hl_fortran.so
@IFMPI at usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@.a usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5.a
@IFMPI at usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_fortran.a usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_fortran.a
@IFMPI at usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_hl.a usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_hl.a
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_hl_fortran.a usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_hl_fortran.a
+ at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@hl_fortran.a usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5hl_fortran.a
diff --git a/debian/libhdf5-flavor-dev.postinst.in b/debian/libhdf5-flavor-dev.postinst.in
index 59d82e7..1cde179 100644
--- a/debian/libhdf5-flavor-dev.postinst.in
+++ b/debian/libhdf5-flavor-dev.postinst.in
@@ -15,14 +15,14 @@ set -e
--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 \
- --slave ${LIB}/libhdf5_mpi_hl_fortran.so.8.0.2 libhdf5_mpi_hl_fortran.so.8.0.2 ${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2 \
+ --slave ${LIB}/libhdf5_mpihl_fortran.so.8.0.2 libhdf5_mpihl_fortran.so.8.0.2 ${LIB}/libhdf5 at FLAVORLIB@hl_fortran.so.8.0.2 \
--slave ${LIB}/libhdf5_mpi.so.8 libhdf5_mpi.so.8 ${LIB}/libhdf5 at FLAVORLIB@.so.8.0.2 \
--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_mpihl_fortran.so.8 libhdf5_mpihl_fortran.so.8 ${LIB}/libhdf5 at FLAVORLIB@hl_fortran.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
+ --slave ${LIB}/libhdf5_mpihl_fortran.so libhdf5_mpihl_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 \
@@ -30,18 +30,15 @@ set -e
--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 \
- --slave ${LIB}/libhdf5_hl_fortran.so.8.0.2 libhdf5_hl_fortran.so.8.0.2 ${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2 \
- --slave ${LIB}/libhdf5hl_fortran.so.8.0.2 libhdf5hl_fortran.so.8.0.2 ${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2 \
+ --slave ${LIB}/libhdf5hl_fortran.so.8.0.2 libhdf5hl_fortran.so.8.0.2 ${LIB}/libhdf5 at FLAVORLIB@hl_fortran.so.8.0.2 \
--slave ${LIB}/libhdf5.so.8 libhdf5.so.8 ${LIB}/libhdf5 at FLAVORLIB@.so.8.0.2 \
--slave ${LIB}/libhdf5_hl.so.8 libhdf5_hl.so.8 ${LIB}/libhdf5 at FLAVORLIB@_hl.so.8.0.2 \
--slave ${LIB}/libhdf5_fortran.so.8 libhdf5_fortran.so.8 ${LIB}/libhdf5 at FLAVORLIB@_fortran.so.8.0.2 \
- --slave ${LIB}/libhdf5_hl_fortran.so.8 libhdf5_hl_fortran.so.8 ${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2 \
- --slave ${LIB}/libhdf5hl_fortran.so.8 libhdf5hl_fortran.so.8 ${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2 \
+ --slave ${LIB}/libhdf5hl_fortran.so.8 libhdf5hl_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.so.8.0.2 \
- --slave ${LIB}/libhdf5_hl_fortran.so libhdf5_hl_fortran.so ${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2 \
- --slave ${LIB}/libhdf5hl_fortran.so libhdf5hl_fortran.so ${LIB}/libhdf5 at FLAVORLIB@_hl_fortran.so.8.0.2
+ --slave ${LIB}/libhdf5hl_fortran.so libhdf5hl_fortran.so ${LIB}/libhdf5 at FLAVORLIB@hl_fortran.so.8.0.2 \
#DEBHELPER#
diff --git a/debian/libhdf5-flavor-soname.install.in b/debian/libhdf5-flavor-soname.install.in
index cedba24..4138d0e 100644
--- a/debian/libhdf5-flavor-soname.install.in
+++ b/debian/libhdf5-flavor-soname.install.in
@@ -1,4 +1,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/*/libhdf5 at FLAVORLIB@hl_fortran.so.*
diff --git a/debian/libhdf5-flavor-soname.shlibs.in b/debian/libhdf5-flavor-soname.shlibs.in
index bae243c..37287b2 100644
--- a/debian/libhdf5-flavor-soname.shlibs.in
+++ b/debian/libhdf5-flavor-soname.shlibs.in
@@ -1,5 +1,5 @@
libhdf5_fortran @SONAME@ libhdf5-serial- at SONAME@
libhdf5 @SONAME@ libhdf5-serial- at SONAME@ | libhdf5-openmpi- at SONAME@ | libhdf5-mpich- at SONAME@
libhdf5_hl @SONAME@ libhdf5-serial- at SONAME@ | libhdf5-openmpi- at SONAME@ | libhdf5-mpich- at SONAME@
-libhdf5_hl_fortran @SONAME@ libhdf5-serial- at SONAME@ | libhdf5-openmpi- at SONAME@ | libhdf5-mpich- at SONAME@
+libhdf5hl_fortran @SONAME@ libhdf5-serial- at SONAME@ | libhdf5-openmpi- at SONAME@ | libhdf5-mpich- at SONAME@
diff --git a/debian/libhdf5-openmpi-8.symbols b/debian/libhdf5-openmpi-8.symbols
index 1afc0ad..d83fca0 100644
--- a/debian/libhdf5-openmpi-8.symbols
+++ b/debian/libhdf5-openmpi-8.symbols
@@ -3768,7 +3768,7 @@ libhdf5_hl.so.8 libhdf5-openmpi-8 #MINVER#
str_cset at Base 1.8.7
str_pad at Base 1.8.7
str_size at Base 1.8.7
-libhdf5_hl_fortran.so.8 libhdf5-openmpi-8 #MINVER#
+libhdf5hl_fortran.so.8 libhdf5-openmpi-8 #MINVER#
H5IM_get_palette at Base 1.8.7
H5IMget_palettef at Base 1.8.7
H5IMmake_image_24bitf at Base 1.8.7
diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch
index 6aa9153..5e5b045 100644
--- a/debian/patches/flavor-configure-option.patch
+++ b/debian/patches/flavor-configure-option.patch
@@ -263,7 +263,7 @@ Index: hdf5-1.8.13+docs/fortran/src/h5fc.in
# conditionnaly link with the hl library
if test "X$HL" = "Xhl"; then
- libraries=" $libraries -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 "
-+ libraries=" $libraries -lhdf5 at FLAVOR@_hl_fortran -lhdf5 at FLAVOR@_hl -lhdf5 at FLAVOR@_fortran -lhdf5 at FLAVOR@ "
++ libraries=" $libraries -lhdf5 at FLAVOR@hl_fortran -lhdf5 at FLAVOR@_hl -lhdf5 at FLAVOR@_fortran -lhdf5 at FLAVOR@ "
else
- libraries=" $libraries -lhdf5_fortran -lhdf5 "
+ libraries=" $libraries -lhdf5 at FLAVOR@_fortran -lhdf5 at FLAVOR@ "
@@ -287,7 +287,7 @@ Index: hdf5-1.8.13+docs/fortran/src/h5fc.in
;;
-lhdf5hl_fortran)
- new_libraries="$new_libraries ${libdir}/libhdf5hl_fortran.a"
-+ new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_hl_fortran.a"
++ new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@hl_fortran.a"
;;
*)
new_libraries="$new_libraries $lib"
@@ -402,7 +402,7 @@ Index: hdf5-1.8.13+docs/config/commence.am
-LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
+LIBH5_HL=$(top_builddir)/hl/src/libhdf5 at FLAVOR@_hl.la
-+LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5 at FLAVOR@_hl_fortran.la
++LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5 at FLAVOR@hl_fortran.la
+LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
# Install directories that automake doesn't know about
@@ -416,11 +416,11 @@ Index: hdf5-1.8.13+docs/hl/fortran/src/Makefile.am
# Our main target, the high-level fortran library
-lib_LTLIBRARIES=libhdf5hl_fortran.la
-+lib_LTLIBRARIES=libhdf5 at FLAVOR@_hl_fortran.la
++lib_LTLIBRARIES=libhdf5 at FLAVOR@hl_fortran.la
# Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am)
-libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5 at FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
# Some Fortran compilers can't build shared libraries, so sometimes we
# want to build a shared C library and a static Fortran library. If so,
@@ -429,12 +429,12 @@ Index: hdf5-1.8.13+docs/hl/fortran/src/Makefile.am
# List sources to include in the HDF5 HL Fortran library.
-libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
-+libhdf5 at FLAVOR@_hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
++libhdf5 at FLAVOR@hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90
# HDF5 HL Fortran library depends on HDF5 Library.
-libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
-+libhdf5 at FLAVOR@_hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
++libhdf5 at FLAVOR@hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
# Fortran module files can have different extensions and different names
# (e.g., different capitalizations) on different platforms. Write rules
diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index c8d927e..ee10a49 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -48,11 +48,11 @@ index dd0a079..35c474d 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -30,7 +30,7 @@ AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/s
- lib_LTLIBRARIES=libhdf5 at FLAVOR@_hl_fortran.la
+ lib_LTLIBRARIES=libhdf5 at FLAVOR@hl_fortran.la
# Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am)
--libhdf5 at FLAVOR@_hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) -Wl,--version-script,$(top_srcdir)/debian/map at FLAVOR@.ver
+-libhdf5 at FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5 at FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) -Wl,--version-script,$(top_srcdir)/debian/map at FLAVOR@.ver
# Some Fortran compilers can't build shared libraries, so sometimes we
# want to build a shared C library and a static Fortran library. If so,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git
More information about the Pkg-grass-devel
mailing list