This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository hdf5.
commit d793c46dd5c8c70e90ae2b16d993f40d72168bc6
Author: Gilles Filippini <p...@debian.org>
Date: Fri Feb 10 16:43:26 2017 +0100
Improve flavor-configure-option.patch
to manage -dev packages' symlinks and clean-up debian/rules a bit.
---
debian/changelog | 7 +
debian/libhdf5-flavor-dev.install.in | 9 +-
debian/libhdf5-flavor-dev.links.in | 17 --
debian/man/h5pcc.mpich.1 | 1 +
debian/man/h5pcc.openmpi.1 | 1 +
debian/man/h5pfc.mpich.1 | 1 +
debian/man/h5pfc.openmpi.1 | 1 +
debian/patches/flavor-configure-option.patch | 235 ++++++++++++++++++++++-----
debian/rules | 15 +-
9 files changed, 217 insertions(+), 70 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 90309cb..dae1364 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.10.0-patch1+docs-5) UNRELEASED; urgency=medium
+
+ * Improve flavor-configure-option.patch to manage -dev packages'
+ symlinks and clean-up debian/rules a bit
+
+ -- Gilles Filippini <p...@debian.org> Fri, 10 Feb 2017 00:26:57 +0100
+
hdf5 (1.10.0-patch1+docs-4) unstable; urgency=medium
* debian/rules: fix javahelper invocation (closes: #871506)
diff --git a/debian/libhdf5-flavor-dev.install.in
b/debian/libhdf5-flavor-dev.install.in
index 1c1742b..9acd7d4 100644
--- a/debian/libhdf5-flavor-dev.install.in
+++ b/debian/libhdf5-flavor-dev.install.in
@@ -2,5 +2,10 @@ usr/include
usr/lib/*/libhdf5*.so
usr/lib/*/libhdf5*.settings
usr/lib/*/libhdf5*.a
-@IFMPI@usr/bin/h5pcc
-@IFMPI@usr/bin/h5pfc
+usr/lib/*/hdf5/*/libhdf5*.so
+usr/lib/*/hdf5/*/libhdf5*.settings
+usr/lib/*/hdf5/*/libhdf5*.a
+usr/lib/*/hdf5/*/include
+usr/lib/*/hdf5/*/lib
+@IFMPI@usr/bin/h5pcc.@FLAVOR@
+@IFMPI@usr/bin/h5pfc.@FLAVOR@
diff --git a/debian/libhdf5-flavor-dev.links.in
b/debian/libhdf5-flavor-dev.links.in
deleted file mode 100644
index 4b996c3..0000000
--- a/debian/libhdf5-flavor-dev.links.in
+++ /dev/null
@@ -1,17 +0,0 @@
-usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@.so
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5.so
-usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@_fortran.so
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_fortran.so
-usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@_hl.so
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl.so
-usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@hl_fortran.so
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5hl_fortran.so
-@IFSERIAL@usr/lib/@MULTIARCH@/libhdf5_cpp.so
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_cpp.so
-@IFSERIAL@usr/lib/@MULTIARCH@/libhdf5_hl_cpp.so
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl_cpp.so
-
-usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@.a
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5.a
-usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@_fortran.a
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_fortran.a
-usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@_hl.a
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl.a
-usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@hl_fortran.a
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5hl_fortran.a
-@IFSERIAL@usr/lib/@MULTIARCH@/libhdf5_cpp.a
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_cpp.a
-@IFSERIAL@usr/lib/@MULTIARCH@/libhdf5_hl_cpp.a
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl_cpp.a
-
-usr/include/hdf5/@FLAVOR@ usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/include
-usr/lib/@MULTIARCH@/hdf5/@FLAVOR@ usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/lib
-usr/lib/@MULTIARCH@/libhdf5_@FLAVOR@.settings
usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5.settings
diff --git a/debian/man/h5pcc.mpich.1 b/debian/man/h5pcc.mpich.1
new file mode 120000
index 0000000..ac75158
--- /dev/null
+++ b/debian/man/h5pcc.mpich.1
@@ -0,0 +1 @@
+h5pcc.1
\ No newline at end of file
diff --git a/debian/man/h5pcc.openmpi.1 b/debian/man/h5pcc.openmpi.1
new file mode 120000
index 0000000..ac75158
--- /dev/null
+++ b/debian/man/h5pcc.openmpi.1
@@ -0,0 +1 @@
+h5pcc.1
\ No newline at end of file
diff --git a/debian/man/h5pfc.mpich.1 b/debian/man/h5pfc.mpich.1
new file mode 120000
index 0000000..5b3fd95
--- /dev/null
+++ b/debian/man/h5pfc.mpich.1
@@ -0,0 +1 @@
+h5pfc.1
\ No newline at end of file
diff --git a/debian/man/h5pfc.openmpi.1 b/debian/man/h5pfc.openmpi.1
new file mode 120000
index 0000000..5b3fd95
--- /dev/null
+++ b/debian/man/h5pfc.openmpi.1
@@ -0,0 +1 @@
+h5pfc.1
\ No newline at end of file
diff --git a/debian/patches/flavor-configure-option.patch
b/debian/patches/flavor-configure-option.patch
index 7fdab33..10f1dcd 100644
--- a/debian/patches/flavor-configure-option.patch
+++ b/debian/patches/flavor-configure-option.patch
@@ -6,11 +6,11 @@ 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 <p...@debian.org>
-Index: hdf5/configure.ac
+Index: hdf5-1.10.0-patch1+docs/configure.ac
===================================================================
---- hdf5.orig/configure.ac
-+++ hdf5/configure.ac
-@@ -3507,6 +3507,24 @@ fi
+--- hdf5-1.10.0-patch1+docs.orig/configure.ac
++++ hdf5-1.10.0-patch1+docs/configure.ac
+@@ -3507,6 +3507,26 @@ fi
##
AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"])
@@ -25,9 +25,11 @@ Index: hdf5/configure.ac
+if test -n "$with_flavor"; then
+ FLAVOR_NAME="$with_flavor"
+ FLAVOR="_$FLAVOR_NAME"
++ AM_CONDITIONAL([FLAVOR], [true])
+else
+ FLAVOR_NAME="(none)"
+ FLAVOR=
++ AM_CONDITIONAL([FLAVOR], [false])
+fi
+AC_SUBST([FLAVOR_NAME])
+AC_SUBST([FLAVOR])
@@ -35,10 +37,10 @@ Index: hdf5/configure.ac
AC_CONFIG_FILES([src/libhdf5.settings
Makefile
src/Makefile
-Index: hdf5/src/libhdf5.settings.in
+Index: hdf5-1.10.0-patch1+docs/src/libhdf5.settings.in
===================================================================
---- hdf5.orig/src/libhdf5.settings.in
-+++ hdf5/src/libhdf5.settings.in
+--- hdf5-1.10.0-patch1+docs.orig/src/libhdf5.settings.in
++++ hdf5-1.10.0-patch1+docs/src/libhdf5.settings.in
@@ -10,6 +10,7 @@ General Information:
Uname information: @UNAME_INFO@
Byte sex: @BYTESEX@
@@ -47,10 +49,10 @@ Index: hdf5/src/libhdf5.settings.in
Compiling Options:
------------------
-Index: hdf5/src/Makefile.am
+Index: hdf5-1.10.0-patch1+docs/src/Makefile.am
===================================================================
---- hdf5.orig/src/Makefile.am
-+++ hdf5/src/Makefile.am
+--- hdf5-1.10.0-patch1+docs.orig/src/Makefile.am
++++ hdf5-1.10.0-patch1+docs/src/Makefile.am
@@ -29,10 +29,10 @@ include $(top_srcdir)/config/lt_vers.am
noinst_PROGRAMS = H5detect H5make_libsettings
@@ -88,18 +90,28 @@ Index: hdf5/src/Makefile.am
endif
# Public headers
-@@ -139,7 +139,9 @@ include_HEADERS = hdf5.h H5api_adpt.h H5
+@@ -139,7 +139,11 @@ include_HEADERS = hdf5.h H5api_adpt.h H5
# install libhdf5.settings in lib directory
settingsdir=$(libdir)
-settings_DATA=libhdf5.settings
++if FLAVOR
+libhdf5@FLAVOR@.settings: libhdf5.settings
+ ln -s $< $@
++endif
+settings_DATA=libhdf5@FLAVOR@.settings
# Number format detection
# The LD_LIBRARY_PATH setting is a kludge.
-@@ -188,7 +190,7 @@ $(top_srcdir)/src/H5overflow.h: $(top_sr
+@@ -181,6 +185,7 @@ $(top_srcdir)/src/H5version.h: $(top_src
+ $(top_srcdir)/src/H5overflow.h: $(top_srcdir)/src/H5overflow.txt
+ perl $(top_srcdir)/bin/make_overflow $?
+
++
+ # Add TRACE macros to library source files. This is done via the trace script
+ # in the hdf5/bin directory. If the file contains HDF5 API macros, a "clean"
+ # version of the source file is saved with a tilde (~) after its name and
+@@ -188,7 +193,7 @@ $(top_srcdir)/src/H5overflow.h: $(top_sr
# without HDF5 macros.
.PHONY: trace
@@ -108,10 +120,35 @@ 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
+@@ -199,4 +204,24 @@ trace: $(libhdf5_la_SOURCES)
+ fi; \
+ done
+
++# Flavor-dev links
++if FLAVOR
++install-exec-hook: relincludedir := $(call
abs2rel,"$(includedir)","$(libdir)")
++install-exec-hook:
++ mkdir -p $(DESTDIR)$(libdir)/hdf5/@FLAVOR_NAME@
++ cd $(DESTDIR)$(libdir) && \
++ for lib in libhdf5@FLAVOR@.*; do \
++ link=$$(echo $$lib | sed 's/@FLAVOR@//') && \
++ $(LN_S) ../../$$lib hdf5/@FLAVOR_NAME@/$$link || \
++ exit 1; \
++ done
++ $(LN_S) . $(DESTDIR)$(libdir)/hdf5/@FLAVOR_NAME@/lib
++ $(LN_S) ../../$(relincludedir)
$(DESTDIR)$(libdir)/hdf5/@FLAVOR_NAME@/include
++
++install-data-hook:
++ mkdir -p $(DESTDIR)$(libdir)/hdf5/@FLAVOR_NAME@
++ cd $(DESTDIR)$(libdir) && \
++ $(LN_S) ../../libhdf5@FLAVOR@.settings
hdf5/@FLAVOR_NAME@/libhdf5.settings
++endif
++
+ include $(top_srcdir)/config/conclude.am
+Index: hdf5-1.10.0-patch1+docs/test/testlibinfo.sh.in
===================================================================
---- hdf5.orig/test/testlibinfo.sh.in
-+++ hdf5/test/testlibinfo.sh.in
+--- hdf5-1.10.0-patch1+docs.orig/test/testlibinfo.sh.in
++++ hdf5-1.10.0-patch1+docs/test/testlibinfo.sh.in
@@ -79,7 +79,7 @@ fi
# built too.
if [ -n $Shared_Lib ]; then
@@ -133,10 +170,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.10.0-patch1+docs/tools/misc/h5cc.in
===================================================================
---- hdf5.orig/tools/misc/h5cc.in
-+++ hdf5/tools/misc/h5cc.in
+--- hdf5-1.10.0-patch1+docs.orig/tools/misc/h5cc.in
++++ hdf5-1.10.0-patch1+docs/tools/misc/h5cc.in
@@ -29,6 +29,7 @@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
@@ -194,10 +231,10 @@ Index: hdf5/tools/misc/h5cc.in
status=$?
fi
-Index: hdf5/c++/src/h5c++.in
+Index: hdf5-1.10.0-patch1+docs/c++/src/h5c++.in
===================================================================
---- hdf5.orig/c++/src/h5c++.in
-+++ hdf5/c++/src/h5c++.in
+--- hdf5-1.10.0-patch1+docs.orig/c++/src/h5c++.in
++++ hdf5-1.10.0-patch1+docs/c++/src/h5c++.in
@@ -27,6 +27,7 @@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
@@ -263,10 +300,10 @@ Index: hdf5/c++/src/h5c++.in
status=$?
fi
-Index: hdf5/fortran/src/h5fc.in
+Index: hdf5-1.10.0-patch1+docs/fortran/src/h5fc.in
===================================================================
---- hdf5.orig/fortran/src/h5fc.in
-+++ hdf5/fortran/src/h5fc.in
+--- hdf5-1.10.0-patch1+docs.orig/fortran/src/h5fc.in
++++ hdf5-1.10.0-patch1+docs/fortran/src/h5fc.in
@@ -27,6 +27,7 @@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
@@ -323,10 +360,10 @@ Index: hdf5/fortran/src/h5fc.in
;;
*)
new_libraries="$new_libraries $lib"
-Index: hdf5/fortran/src/Makefile.am
+Index: hdf5-1.10.0-patch1+docs/fortran/src/Makefile.am
===================================================================
---- hdf5.orig/fortran/src/Makefile.am
-+++ hdf5/fortran/src/Makefile.am
+--- hdf5-1.10.0-patch1+docs.orig/fortran/src/Makefile.am
++++ hdf5-1.10.0-patch1+docs/fortran/src/Makefile.am
@@ -29,10 +29,10 @@ AM_FCFLAGS+=-I$(top_srcdir)/src -I$(top_
AM_FCLIBS=$(LIBHDF5)
@@ -358,10 +395,39 @@ Index: hdf5/fortran/src/Makefile.am
# h5fc is generated during configure.
# Remove it only when distclean.
-Index: hdf5/hl/fortran/src/Makefile.am
+@@ -95,7 +95,11 @@ install-exec-local:
+ # Custom rule for installing h5fc, since it will be named h5pfc if hdf5
+ # is configured for parallel mode
+ if BUILD_PARALLEL_CONDITIONAL
++if FLAVOR
++ H5FC_NAME = h5pfc.@FLAVOR_NAME@
++else
+ H5FC_NAME = h5pfc
++endif
+ else
+ H5FC_NAME = h5fc
+ endif
+@@ -166,4 +170,16 @@ HDF5.lo: $(srcdir)/HDF5.F90
+ H5Off.lo H5Pff.lo H5Rff.lo \
+ H5Sff.lo H5Tff.lo H5Zff.lo H5_gen.lo
+
++# Flavor-dev links
++if FLAVOR
++install-exec-hook:
++ mkdir -p $(DESTDIR)$(libdir)/hdf5/@FLAVOR_NAME@
++ cd $(DESTDIR)$(libdir) && \
++ for lib in libhdf5@FLAVOR@_fortran.*; do \
++ link=$$(echo $$lib | sed 's/@FLAVOR@//') && \
++ $(LN_S) ../../$$lib hdf5/@FLAVOR_NAME@/$$link || \
++ exit 1; \
++ done
++endif
++
+ include $(top_srcdir)/config/conclude_fc.am
+Index: hdf5-1.10.0-patch1+docs/hl/fortran/src/Makefile.am
===================================================================
---- hdf5.orig/hl/fortran/src/Makefile.am
-+++ hdf5/hl/fortran/src/Makefile.am
+--- hdf5-1.10.0-patch1+docs.orig/hl/fortran/src/Makefile.am
++++ hdf5-1.10.0-patch1+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
@@ -389,11 +455,29 @@ Index: hdf5/hl/fortran/src/Makefile.am
# Fortran module files can have different extensions and different names
# (e.g., different capitalizations) on different platforms. Write rules
-Index: hdf5/hl/src/Makefile.am
+@@ -102,4 +102,17 @@ H5IMff.lo: $(srcdir)/H5IMff.F90
+ H5TBff.lo: $(srcdir)/H5TBff.F90
+ H5LTff_gen.lo: H5LTff.lo H5LTff_gen.F90
+ H5TBff_gen.lo: H5TBff.lo H5LTff_gen.F90 H5TBff_gen.F90
++
++# Flavor-dev links
++if FLAVOR
++install-exec-hook:
++ mkdir -p $(DESTDIR)$(libdir)/hdf5/@FLAVOR_NAME@
++ cd $(DESTDIR)$(libdir) && \
++ for lib in libhdf5@FLAVOR@hl_fortran.*; do \
++ link=$$(echo $$lib | sed 's/@FLAVOR@//') && \
++ $(LN_S) ../../$$lib hdf5/@FLAVOR_NAME@/$$link || \
++ exit 1; \
++ done
++endif
++
+ include $(top_srcdir)/config/conclude_fc.am
+Index: hdf5-1.10.0-patch1+docs/hl/src/Makefile.am
===================================================================
---- hdf5.orig/hl/src/Makefile.am
-+++ hdf5/hl/src/Makefile.am
-@@ -25,16 +25,16 @@ include $(top_srcdir)/config/lt_vers.am
+--- hdf5-1.10.0-patch1+docs.orig/hl/src/Makefile.am
++++ hdf5-1.10.0-patch1+docs/hl/src/Makefile.am
+@@ -25,18 +25,30 @@ include $(top_srcdir)/config/lt_vers.am
AM_CPPFLAGS+=-I$(top_srcdir)/src
# This library is our main target.
@@ -414,10 +498,24 @@ 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 H5LDpublic.h
-Index: hdf5/config/commence.am
+
++# Flavor-dev links
++if FLAVOR
++install-exec-hook:
++ mkdir -p $(DESTDIR)$(libdir)/hdf5/@FLAVOR_NAME@
++ cd $(DESTDIR)$(libdir) && \
++ for lib in libhdf5@FLAVOR@_hl.*; do \
++ link=$$(echo $$lib | sed 's/@FLAVOR@//') && \
++ $(LN_S) ../../$$lib hdf5/@FLAVOR_NAME@/$$link || \
++ exit 1; \
++ done
++endif
++
+ include $(top_srcdir)/config/conclude.am
+Index: hdf5-1.10.0-patch1+docs/config/commence.am
===================================================================
---- hdf5.orig/config/commence.am
-+++ hdf5/config/commence.am
+--- hdf5-1.10.0-patch1+docs.orig/config/commence.am
++++ hdf5-1.10.0-patch1+docs/config/commence.am
@@ -32,15 +32,15 @@ CP=cp
RUNEXEC=$(RUNSERIAL)
@@ -438,3 +536,66 @@ Index: hdf5/config/commence.am
LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
# Install directories that automake doesn't know about
+@@ -104,3 +104,4 @@ CHECK_CLEANFILES=*.chkexe *.chklog *.clo
+ help:
+ @$(top_srcdir)/bin/makehelp
+
++abs2rel = $(shell perl -e 'use File::Spec; print File::Spec->abs2rel($(1),
$(2)) . "\n";')
+Index: hdf5-1.10.0-patch1+docs/c++/src/Makefile.am
+===================================================================
+--- hdf5-1.10.0-patch1+docs.orig/c++/src/Makefile.am
++++ hdf5-1.10.0-patch1+docs/c++/src/Makefile.am
+@@ -68,4 +68,16 @@ mostlyclean-local:
+ # Mark this directory as part of the C++ API
+ CXX_API=yes
+
++# Flavor-dev links
++if FLAVOR
++install-exec-hook:
++ mkdir -p $(DESTDIR)$(libdir)/hdf5/@FLAVOR_NAME@
++ cd $(DESTDIR)$(libdir) && \
++ for lib in libhdf5_cpp.*; do \
++ link=$$(echo $$lib | sed 's/@FLAVOR@//') && \
++ $(LN_S) ../../$$lib hdf5/@FLAVOR_NAME@/$$link || \
++ exit 1; \
++ done
++endif
++
+ include $(top_srcdir)/config/conclude.am
+Index: hdf5-1.10.0-patch1+docs/hl/c++/src/Makefile.am
+===================================================================
+--- hdf5-1.10.0-patch1+docs.orig/hl/c++/src/Makefile.am
++++ hdf5-1.10.0-patch1+docs/hl/c++/src/Makefile.am
+@@ -40,4 +40,16 @@ libhdf5_hl_cpp_la_LIBADD=$(LIBH5_HL) $(L
+ # Public headers
+ include_HEADERS=H5PacketTable.h
+
++# Flavor-dev links
++if FLAVOR
++install-exec-hook:
++ mkdir -p $(DESTDIR)$(libdir)/hdf5/@FLAVOR_NAME@
++ cd $(DESTDIR)$(libdir) && \
++ for lib in libhdf5_hl_cpp.*; do \
++ link=$$(echo $$lib | sed 's/@FLAVOR@//') && \
++ $(LN_S) ../../$$lib hdf5/@FLAVOR_NAME@/$$link || \
++ exit 1; \
++ done
++endif
++
+ include $(top_srcdir)/config/conclude.am
+Index: hdf5-1.10.0-patch1+docs/tools/misc/Makefile.am
+===================================================================
+--- hdf5-1.10.0-patch1+docs.orig/tools/misc/Makefile.am
++++ hdf5-1.10.0-patch1+docs/tools/misc/Makefile.am
+@@ -63,7 +63,11 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5)
+ # h5cc needs custom install and uninstall rules, since it may be
+ # named h5pcc if hdf5 is being built in parallel mode.
+ if BUILD_PARALLEL_CONDITIONAL
++if FLAVOR
++ H5CC_NAME=h5pcc.@FLAVOR_NAME@
++else
+ H5CC_NAME=h5pcc
++endif
+ else
+ H5CC_NAME=h5cc
+ endif
diff --git a/debian/rules b/debian/rules
index c6dcede..c2fa414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -190,7 +190,7 @@ debian/libhdf5$(2)-%: debian/libhdf5-flavor-%
endef
$(foreach flavor,$(FLAVORS),$(eval $(call
helper_flavor_rule,$(flavor),$(flavorpkg))))
-# End of helpar files generation snippets
+# End of helper files generation snippets
%:
@@ -199,7 +199,6 @@ $(foreach flavor,$(FLAVORS),$(eval $(call
helper_flavor_rule,$(flavor),$(flavorp
override_dh_auto_clean: debian/control
rm -fr $(DEBIAN_OUT)
rm -fr debian/build-*
- rm -f debian/man/h5p[cf]c.*.1
rm -f c++/src/cpp_doc_config_u
rm -fr html/cpplus_RM
@@ -212,11 +211,6 @@ configure_%: flavor_map = $(or $(findstring
mpi,$(flavor)),serial)
configure_%: builddir = debian/build-$(flavor)
configure_%: $(DEBIAN_OUT)
$($(FLAVOR)_ENV) dh_auto_configure --builddirectory=$(builddir) --
$(CONFIGURE_FLAGS) $($(FLAVOR)_FLAGS)
- $(if $(findstring mpi,$(flavor)),$(link_h5p_manpages),)
-define link_h5p_manpages
- ln debian/man/h5pcc.1 debian/man/h5pcc.$(flavor).1
- ln debian/man/h5pfc.1 debian/man/h5pfc.$(flavor).1
-endef
override_dh_auto_configure: $(foreach flavor,$(FLAVORS),configure_$(flavor))
@@ -259,13 +253,6 @@ dh_install_%:
dh_install $(foreach pkg,$(PACKAGES_$(flavor)),-p$(pkg))
--sourcedir=$(destdir)
install -d debian/$(devpkg)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
sed 's/@MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' debian/hdf5-$(flavor).pc
>debian/$(devpkg)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5-$(flavor).pc
- $(if $(findstring mpi,$(flavor)),$(rename_h5p_helpers),)
-define rename_h5p_helpers
- cd debian/$(devpkg)/usr/bin && \
- $(foreach lang,c f, \
- mv h5p$(lang)c h5p$(lang)c.$(flavor) && \
- ) :
-endef
override_dh_install-arch: $(foreach flavor,$(FLAVORS),dh_install_$(flavor))
find debian/$(serpack)/usr/lib -name '*cpp*' -delete
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/hdf5.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
