Source: salome-kernel Version: 6.5.0-8 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 iQEcBAEBCAAGBQJT2sgkAAoJEO/obGx//s+DikAH/igfKevNF8tS9SGPEhc+O23g VCBgYQI+lEQl5thCQVGZuqRUoCsSyAONV6bv6okE9Fw93Ne+Ymrcc0UlKzRN7lXa DclNbQZxV/fCVxU+9QSrs/Vq0IVui6GbaiAreXzs3/lX4optQ/hNxtST1hJ5H4Vn f3pbEl7mh01SaJoF9VdbvWi9tCuDiDFJNlxBQmQWFwTUCpORgIRRamfXvLt930rC w0MqxXWO0mIKwSF2uNSQNEYaaReSiGzY4ksJ9gwdtbZ5Qd6Dnr5JUQ8rCaSVW+DC IotZVHp5d5Xonaq7u4zrPc9QoItSVOrvdl/UxAs4vzenjhF/25ZV6S+dN7Z/syA= =Vw5A -----END PGP SIGNATURE-----
diff -u salome-kernel-6.5.0/debian/changelog salome-kernel-6.5.0/debian/changelog --- salome-kernel-6.5.0/debian/changelog +++ salome-kernel-6.5.0/debian/changelog @@ -1,3 +1,10 @@ +salome-kernel (6.5.0-8.1) unstable; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout. + + -- Gilles Filippini <p...@debian.org> Sat, 26 Jul 2014 17:11:18 +0200 + salome-kernel (6.5.0-8) unstable; urgency=low * Fix FTBFS with new boost yet again (closes: #735807). diff -u salome-kernel-6.5.0/debian/rules salome-kernel-6.5.0/debian/rules --- salome-kernel-6.5.0/debian/rules +++ salome-kernel-6.5.0/debian/rules @@ -15,6 +15,18 @@ include /usr/share/quilt/quilt.make +ifneq ($(wildcard /usr/share/mpi-default-dev/debian_defaults),) + # Which MPI implementation? + # set ARCH_DEFAULT_MPI_IMPL + include /usr/share/mpi-default-dev/debian_defaults + HDF5_FLAVOR := $(ARCH_DEFAULT_MPI_IMPL) +else + HDF5_FLAVOR := serial +endif +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(HDF5_FLAVOR)/libhdf5.so),) + WITH_HDF5 := --with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(HDF5_FLAVOR) +endif + clean: unpatch dh_testdir -rm -rf $(builddir) $(builddir)-doc @@ -61,6 +73,7 @@ --disable-dependency-tracking \ --disable-maintainer-mode \ --with-mpi=/usr --with-mpi_include=/usr/include/mpi \ + $(WITH_HDF5) \ --bindir=/usr/lib/salome/bin --libdir=/usr/lib/salome/lib \ --docdir=/usr/share/doc/salome-kernel-doc \ CASROOT=/usr \
-- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
