Source: scilab Version: 5.5.0-2 Severity: important Tags: patch User: p...@debian.org Usertags: HDF5-transition
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, The hdf5 1.8.13 package in experimental features a new layout for headers and libraries, so that all the binary packages are now co-installable. Please find attached a patch proposal to support both the current and the new layouts. Because this bug is in the way of the hdf5 transition I intend to NMU in a few days. I apologize for the urge, and I hope this approach won't offend you. Please tell me otherwise. Kind regards, _g. - -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (500, 'testing'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 3.14-1-486 Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBCAAGBQJT2shUAAoJEO/obGx//s+DvRQH/iwQGSKXmlY8OVwI9PAs18dV qay34L+44W4J1LbB7FdQFk0SeXi3x41VjIx09O7hxswyw8Oa0/Cfu9TAZguJnRaN 2JKCHzvF05KWGQH5jgfvQOd/cxwpwIVnwygpHANs/NLqkPFshWLvCpp3EmcO/o5H YniAuVjZ23yIwNQ0FCkD/gKhJPYgVYsY0MP2iBuFoimY909cDYEWVdpTPJf6jS5B qJCOw1F3OT6V71f5NYet2WznAkl5ViGJ5h+dxLY5bvlSZEAmN7PotIpwA5Qodpiu KIBvExyd72zK88RNV/oN//Tz8bceytcr8i56XZvDW6jOVLP/MfE1GmXyotYPafw= =7SsP -----END PGP SIGNATURE-----
diff -Nru scilab-5.5.0/debian/changelog scilab-5.5.0/debian/changelog --- scilab-5.5.0/debian/changelog 2014-04-16 17:26:42.000000000 +0200 +++ scilab-5.5.0/debian/changelog 2014-07-31 18:36:03.000000000 +0200 @@ -1,3 +1,12 @@ +scilab (5.5.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout. + * New patch m4-hdf5.patch: fix typo and unneeded dependency on + inexistant libsz. + + -- Gilles Filippini <p...@debian.org> Sat, 26 Jul 2014 18:38:24 +0200 + scilab (5.5.0-2) unstable; urgency=medium * Bring back the signal processing library (Don't know why it was missing) diff -Nru scilab-5.5.0/debian/patches/m4-hdf5.patch scilab-5.5.0/debian/patches/m4-hdf5.patch --- scilab-5.5.0/debian/patches/m4-hdf5.patch 1970-01-01 01:00:00.000000000 +0100 +++ scilab-5.5.0/debian/patches/m4-hdf5.patch 2014-07-31 18:36:03.000000000 +0200 @@ -0,0 +1,30 @@ +Description: There is no libsz availlable. + The macro was succesfull with libhdf5 installed in system path because + of the missing comma in the second block. With this comma in place the + test fails in every case because of libsz beeing unavaillable. Then + removing -lsz. +Author: Gilles Filippini <p...@debian.org> +Index: scilab-5.5.0/m4/hdf5.m4 +=================================================================== +--- scilab-5.5.0.orig/m4/hdf5.m4 2014-04-11 11:51:34.000000000 +0200 ++++ scilab-5.5.0/m4/hdf5.m4 2014-07-27 13:24:54.247645063 +0200 +@@ -53,7 +53,7 @@ + AC_CHECK_LIB([hdf5], [H5Fopen], + [], + [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen) in $with_hdf5_library. Check if libhdf5 is installed and if the version is correct])], +- [-lsz -lz] ++ [-lz] + ) + + else +@@ -61,8 +61,8 @@ + LIBS="$LIBS $HDF5_LIBS" + AC_CHECK_LIB([hdf5], [H5Fopen], + [], +- [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])] +- [-lsz -lz] ++ [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])], ++ [-lz] + ) + fi + diff -Nru scilab-5.5.0/debian/patches/series scilab-5.5.0/debian/patches/series --- scilab-5.5.0/debian/patches/series 2014-04-11 16:51:15.000000000 +0200 +++ scilab-5.5.0/debian/patches/series 2014-07-31 18:36:03.000000000 +0200 @@ -5,3 +5,4 @@ jh.diff depend-scicos.diff missing-lib.diff +m4-hdf5.patch diff -Nru scilab-5.5.0/debian/rules scilab-5.5.0/debian/rules --- scilab-5.5.0/debian/rules 2014-04-16 17:28:05.000000000 +0200 +++ scilab-5.5.0/debian/rules 2014-07-31 18:37:50.000000000 +0200 @@ -21,6 +21,10 @@ --enable-mpi --disable-static-system-lib # --enable-compilation-tests +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),) + DEB_CONFIGURE_NORMAL_ARGS += --with-hdf5-include=/usr/include/hdf5/serial \ + --with-hdf5-library=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial +endif # requires ocamlopt ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64el mips mipsel s390x sparc))
