Source: code-saturne Version: 3.3.1-1 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 iQEcBAEBCAAGBQJT2rdNAAoJEO/obGx//s+DV/YH/iShS7y9Z1UAKBCqCPTt8qg8 SYetfMm/xOcPmRZDNqHSLdCrRRnm/ZPq3fe/+ktYSLM2Ke9/STE28aLnvHDLgg0A FZudMist2GxOyr//xvJtFoCW2yG4/AtfgxXBvS/nncdchOnDLSSXY/qX+r5mvPfr Q+lKeTxADL34hWQ2arG5bUZpG6BtbLiFrzr9r2r34qhZm7XAzREOAf+60Irke2ZL Lk1fA6dJW1bUwIWZPKBM08HoGCM7+N5a9Cxkoors2yLzEwsfAgHZIolVebpD85aK kUE9tz0XfraSaag4l4aOOjXweCdn/dc8k26Dj2vfGDx4cWJrkyxZqP8Ay4BweZA= =zYSL -----END PGP SIGNATURE-----
diff -Nru code-saturne-3.3.1/debian/changelog code-saturne-3.3.1/debian/changelog --- code-saturne-3.3.1/debian/changelog 2014-07-14 15:27:45.000000000 +0200 +++ code-saturne-3.3.1/debian/changelog 2014-07-24 16:15:19.000000000 +0200 @@ -1,3 +1,10 @@ +code-saturne (3.3.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout. + + -- Gilles Filippini <p...@debian.org> Thu, 24 Jul 2014 16:15:19 +0200 + code-saturne (3.3.1-1) unstable; urgency=medium * New upstream release diff -Nru code-saturne-3.3.1/debian/rules code-saturne-3.3.1/debian/rules --- code-saturne-3.3.1/debian/rules 2014-07-14 15:26:32.000000000 +0200 +++ code-saturne-3.3.1/debian/rules 2014-07-31 09:22:36.000000000 +0200 @@ -5,7 +5,18 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/autoreconf.mk +# Which MPI implementation? +# set ARCH_DEFAULT_MPI_IMPL +include /usr/share/mpi-default-dev/debian_defaults + DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/ --with-mpi --libexecdir=/usr/lib/ + +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/libhdf5.so),) + DEB_CONFIGURE_USER_FLAGS += \ + --with-hdf5-include=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \ + --with-hdf5-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) +endif + #--libdir=/usr/lib/code_saturne DEB_MAKE_BUILD_TARGET := all DEB_MAKE_INSTALL_TARGET := install DESTDIR=`pwd`/debian/tmp
