[hdf5] 14/24: typo
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Jun 8 12:51:26 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 4ef6ebf359ecd3111ddbd90a07c24e203561c6dd
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jun 4 04:02:33 2014 +0100
typo
---
debian/libhdf5-flavor-soname.install.in | 2 +-
debian/patches/flavor-configure-option.patch | 151 +++++++++++++--------------
2 files changed, 74 insertions(+), 79 deletions(-)
diff --git a/debian/libhdf5-flavor-soname.install.in b/debian/libhdf5-flavor-soname.install.in
index 4138d0e..cedba24 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/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch
index 4259f06..632f270 100644
--- a/debian/patches/flavor-configure-option.patch
+++ b/debian/patches/flavor-configure-option.patch
@@ -6,10 +6,10 @@ Description: Add option --with-flavor=<flavor-name> to configure
* serial is built with no flavor name
* $mpi parallel versions use --with-flavor=$mpi
Author: Gilles Filippini <pini at debian.org>
-Index: hdf5/configure.ac
+Index: hdf5-1.8.13+docs/configure.ac
===================================================================
---- hdf5.orig/configure.ac
-+++ hdf5/configure.ac
+--- hdf5-1.8.13+docs.orig/configure.ac
++++ hdf5-1.8.13+docs/configure.ac
@@ -4494,6 +4494,24 @@ fi
##
AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"])
@@ -35,10 +35,10 @@ Index: hdf5/configure.ac
AC_CONFIG_FILES([src/libhdf5.settings
Makefile
src/Makefile
-Index: hdf5/src/libhdf5.settings.in
+Index: hdf5-1.8.13+docs/src/libhdf5.settings.in
===================================================================
---- hdf5.orig/src/libhdf5.settings.in
-+++ hdf5/src/libhdf5.settings.in
+--- hdf5-1.8.13+docs.orig/src/libhdf5.settings.in
++++ hdf5-1.8.13+docs/src/libhdf5.settings.in
@@ -12,6 +12,7 @@ General Information:
Byte sex: @BYTESEX@
Libraries: @STATIC_SHARED@
@@ -47,10 +47,10 @@ Index: hdf5/src/libhdf5.settings.in
Compiling Options:
------------------
-Index: hdf5/src/Makefile.am
+Index: hdf5-1.8.13+docs/src/Makefile.am
===================================================================
---- hdf5.orig/src/Makefile.am
-+++ hdf5/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/src/Makefile.am
++++ hdf5-1.8.13+docs/src/Makefile.am
@@ -29,10 +29,10 @@ include $(top_srcdir)/config/lt_vers.am
noinst_PROGRAMS = H5detect H5make_libsettings
@@ -93,10 +93,10 @@ Index: hdf5/src/Makefile.am
@for dep in $? dummy; do \
if test $$dep != "dummy" -a -n "$(PERL)"; then \
case "$$dep" in \
-Index: hdf5/test/testlibinfo.sh.in
+Index: hdf5-1.8.13+docs/test/testlibinfo.sh.in
===================================================================
---- hdf5.orig/test/testlibinfo.sh.in
-+++ hdf5/test/testlibinfo.sh.in
+--- hdf5-1.8.13+docs.orig/test/testlibinfo.sh.in
++++ hdf5-1.8.13+docs/test/testlibinfo.sh.in
@@ -79,7 +79,7 @@ fi
# built too.
if [ -n $Shared_Lib ]; then
@@ -118,10 +118,10 @@ Index: hdf5/test/testlibinfo.sh.in
fi
# Check if executables has the lib information only if shared lib is not
-Index: hdf5/tools/misc/h5cc.in
+Index: hdf5-1.8.13+docs/tools/misc/h5cc.in
===================================================================
---- hdf5.orig/tools/misc/h5cc.in
-+++ hdf5/tools/misc/h5cc.in
+--- hdf5-1.8.13+docs.orig/tools/misc/h5cc.in
++++ hdf5-1.8.13+docs/tools/misc/h5cc.in
@@ -172,7 +172,7 @@ usage() {
# libhdf5.settings file reside in the lib directory.
showconfigure()
@@ -159,10 +159,10 @@ Index: hdf5/tools/misc/h5cc.in
;;
*)
new_libraries="$new_libraries $lib"
-Index: hdf5/c++/src/Makefile.am
+Index: hdf5-1.8.13+docs/c++/src/Makefile.am
===================================================================
---- hdf5.orig/c++/src/Makefile.am
-+++ hdf5/c++/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/c++/src/Makefile.am
++++ hdf5-1.8.13+docs/c++/src/Makefile.am
@@ -25,10 +25,10 @@ include $(top_srcdir)/config/lt_vers.am
AM_CPPFLAGS+=-I$(top_srcdir)/src
@@ -194,10 +194,10 @@ Index: hdf5/c++/src/Makefile.am
# Public headers
include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \
-Index: hdf5/c++/src/h5c++.in
+Index: hdf5-1.8.13+docs/c++/src/h5c++.in
===================================================================
---- hdf5.orig/c++/src/h5c++.in
-+++ hdf5/c++/src/h5c++.in
+--- hdf5-1.8.13+docs.orig/c++/src/h5c++.in
++++ hdf5-1.8.13+docs/c++/src/h5c++.in
@@ -161,7 +161,7 @@ usage() {
# libhdf5.settings file reside in the lib directory.
showconfigure()
@@ -245,10 +245,10 @@ Index: hdf5/c++/src/h5c++.in
;;
*)
new_libraries="$new_libraries $lib"
-Index: hdf5/fortran/src/h5fc.in
+Index: hdf5-1.8.13+docs/fortran/src/h5fc.in
===================================================================
---- hdf5.orig/fortran/src/h5fc.in
-+++ hdf5/fortran/src/h5fc.in
+--- hdf5-1.8.13+docs.orig/fortran/src/h5fc.in
++++ hdf5-1.8.13+docs/fortran/src/h5fc.in
@@ -156,7 +156,7 @@ usage() {
# libhdf5.settings file reside in the lib directory.
showconfigure()
@@ -262,7 +262,7 @@ Index: hdf5/fortran/src/h5fc.in
shared_link=""
# conditionnaly link with the hl library
if test "X$HL" = "Xhl"; then
-- libraries=" $libraries -lhdf5_hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 "
+- 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@ "
else
- libraries=" $libraries -lhdf5_fortran -lhdf5 "
@@ -270,36 +270,31 @@ Index: hdf5/fortran/src/h5fc.in
fi
link_args="$link_args -L${libdir}"
-@@ -327,17 +327,17 @@ if test "x$do_link" = "xyes"; then
- new_libraries=""
+@@ -328,16 +328,16 @@ if test "x$do_link" = "xyes"; then
for lib in $libraries; do
case "$lib" in
-- -lhdf5)
+ -lhdf5)
- new_libraries="$new_libraries ${libdir}/libhdf5.a"
-+ -lhdf5 at FLAVOR@)
+ new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@.a"
;;
-- -lhdf5_hl)
+ -lhdf5_hl)
- new_libraries="$new_libraries ${libdir}/libhdf5_hl.a"
-+ -lhdf5 at FLAVOR@_hl)
+ new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_hl.a"
;;
-- -lhdf5_fortran)
+ -lhdf5_fortran)
- new_libraries="$new_libraries ${libdir}/libhdf5_fortran.a"
-+ -lhdf5 at FLAVOR@_fortran)
+ new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_fortran.a"
;;
-- -lhdf5_hl_fortran)
-- new_libraries="$new_libraries ${libdir}/libhdf5_hl_fortran.a"
-+ -lhdf5 at FLAVOR@_hl_fortran)
+ -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 $lib"
-Index: hdf5/fortran/src/Makefile.am
+Index: hdf5-1.8.13+docs/fortran/src/Makefile.am
===================================================================
---- hdf5.orig/fortran/src/Makefile.am
-+++ hdf5/fortran/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/fortran/src/Makefile.am
++++ hdf5-1.8.13+docs/fortran/src/Makefile.am
@@ -29,10 +29,10 @@ AM_FCFLAGS+=-I$(top_srcdir)/src -I$(top_
AM_FCLIBS=$(LIBHDF5)
@@ -331,10 +326,10 @@ Index: hdf5/fortran/src/Makefile.am
# h5fc is generated during configure.
# Remove it only when distclean.
-Index: hdf5/hl/src/Makefile.am
+Index: hdf5-1.8.13+docs/hl/src/Makefile.am
===================================================================
---- hdf5.orig/hl/src/Makefile.am
-+++ hdf5/hl/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/hl/src/Makefile.am
++++ hdf5-1.8.13+docs/hl/src/Makefile.am
@@ -25,16 +25,16 @@ include $(top_srcdir)/config/lt_vers.am
AM_CPPFLAGS+=-I$(top_srcdir)/src
@@ -356,10 +351,10 @@ Index: hdf5/hl/src/Makefile.am
# Public header files (to be installed)
include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h
-Index: hdf5/hl/c++/src/Makefile.am
+Index: hdf5-1.8.13+docs/hl/c++/src/Makefile.am
===================================================================
---- hdf5.orig/hl/c++/src/Makefile.am
-+++ hdf5/hl/c++/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/hl/c++/src/Makefile.am
++++ hdf5-1.8.13+docs/hl/c++/src/Makefile.am
@@ -25,10 +25,10 @@ include $(top_srcdir)/config/lt_vers.am
AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src
@@ -386,19 +381,45 @@ Index: hdf5/hl/c++/src/Makefile.am
# Public headers
include_HEADERS=H5PacketTable.h
-Index: hdf5/hl/fortran/src/Makefile.am
+Index: hdf5-1.8.13+docs/config/commence.am
===================================================================
---- hdf5.orig/hl/fortran/src/Makefile.am
-+++ hdf5/hl/fortran/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/config/commence.am
++++ hdf5-1.8.13+docs/config/commence.am
+@@ -32,15 +32,15 @@ CP=cp
+ RUNEXEC=$(RUNSERIAL)
+
+ # Libraries to link to while building
+-LIBHDF5=$(top_builddir)/src/libhdf5.la
++LIBHDF5=$(top_builddir)/src/libhdf5 at FLAVOR@.la
+ LIBH5TEST=$(top_builddir)/test/libh5test.la
+-LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la
++LIBH5F=$(top_builddir)/fortran/src/libhdf5 at FLAVOR@_fortran.la
+ LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la
+-LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
++LIBH5CPP=$(top_builddir)/c++/src/libhdf5 at FLAVOR@_cpp.la
+ LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la
+-LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la
+-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
++LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5 at FLAVOR@_hl_cpp.la
+
+ # Install directories that automake doesn't know about
+ docdir = $(exec_prefix)/doc
+Index: hdf5-1.8.13+docs/hl/fortran/src/Makefile.am
+===================================================================
+--- hdf5-1.8.13+docs.orig/hl/fortran/src/Makefile.am
++++ hdf5-1.8.13+docs/hl/fortran/src/Makefile.am
@@ -27,10 +27,10 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top
AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
# Our main target, the high-level fortran library
--lib_LTLIBRARIES=libhdf5_hl_fortran.la
+-lib_LTLIBRARIES=libhdf5hl_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_hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
+-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)
# Some Fortran compilers can't build shared libraries, so sometimes we
@@ -407,39 +428,13 @@ Index: hdf5/hl/fortran/src/Makefile.am
#endif
# List sources to include in the HDF5 HL Fortran library.
--libhdf5_hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
+-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 \
H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90
# HDF5 HL Fortran library depends on HDF5 Library.
--libhdf5_hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
+-libhdf5hl_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
-Index: hdf5/config/commence.am
-===================================================================
---- hdf5.orig/config/commence.am
-+++ hdf5/config/commence.am
-@@ -32,15 +32,15 @@ CP=cp
- RUNEXEC=$(RUNSERIAL)
-
- # Libraries to link to while building
--LIBHDF5=$(top_builddir)/src/libhdf5.la
-+LIBHDF5=$(top_builddir)/src/libhdf5 at FLAVOR@.la
- LIBH5TEST=$(top_builddir)/test/libh5test.la
--LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la
-+LIBH5F=$(top_builddir)/fortran/src/libhdf5 at FLAVOR@_fortran.la
- LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la
--LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
-+LIBH5CPP=$(top_builddir)/c++/src/libhdf5 at FLAVOR@_cpp.la
- LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la
--LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la
--LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5_hl_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
-+LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5 at FLAVOR@_hl_cpp.la
-
- # Install directories that automake doesn't know about
- docdir = $(exec_prefix)/doc
--
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