Source: meep-mpi-default
Version: 1.2.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
iQEcBAEBCAAGBQJT2sU5AAoJEO/obGx//s+DF0sIAJyah/wJWkyYVRbq2hgxWjqE
4Oyt2VpaGw9sQPyiLLV7sIWKsSFLRz5/f6PrY0a5PXMjtwPdxK7lzX78IZghI5cY
I41sz5KJoXCNpVCwMJuSpsgxFVi6kAGUa58L09BAFPdX48O4++X4ZYe0vtEupwgc
1IK/aLZf4DL8Zp1ABu7uKonof7xBpzMiP8lCEk/MWo/jlh3SCZiL2DBi/IDNLZYd
ZkrEnVmAbiO/mhuETGX+QPwF5ZYOy3XaU8RV9VeuwHR6G6JTJK2YPSqD6ugyLgT1
CBDC03nc3NrJMeoBKVi5I36By67Ph7zz+FbjKx5wCRu5fLVUr6TSL/jCRrMv/XU=
=BaCA
-----END PGP SIGNATURE-----
diff -Nru meep-mpi-default-1.2.1/debian/changelog meep-mpi-default-1.2.1/debian/changelog
--- meep-mpi-default-1.2.1/debian/changelog 2014-05-11 14:28:44.000000000 +0200
+++ meep-mpi-default-1.2.1/debian/changelog 2014-07-25 14:31:45.000000000 +0200
@@ -1,3 +1,12 @@
+meep-mpi-default (1.2.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Support hdf5 1.8.13 new packaging layout.
+ * debian/control: build-depend on libhdf5-mpi-dev instead of
+ libhdf5-dev.
+
+ -- Gilles Filippini <p...@debian.org> Fri, 25 Jul 2014 14:29:28 +0200
+
meep-mpi-default (1.2.1-1) unstable; urgency=medium
* new upstream version
diff -Nru meep-mpi-default-1.2.1/debian/control meep-mpi-default-1.2.1/debian/control
--- meep-mpi-default-1.2.1/debian/control 2014-05-12 15:04:28.000000000 +0200
+++ meep-mpi-default-1.2.1/debian/control 2014-07-25 14:30:36.000000000 +0200
@@ -11,7 +11,7 @@
libharminv-dev (>= 1.1),
zlib1g-dev,
libfftw3-dev,
- libhdf5-dev,
+ libhdf5-mpi-dev,
libgsl0-dev,
liblapack-dev,
mpi-default-dev,
diff -Nru meep-mpi-default-1.2.1/debian/rules meep-mpi-default-1.2.1/debian/rules
--- meep-mpi-default-1.2.1/debian/rules 2014-05-12 14:37:11.000000000 +0200
+++ meep-mpi-default-1.2.1/debian/rules 2014-07-31 10:48:50.000000000 +0200
@@ -9,6 +9,15 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# Which MPI implementation?
+# set ARCH_DEFAULT_MPI_IMPL
+include /usr/share/mpi-default-dev/debian_defaults
+
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/libhdf5.so),)
+ export DEB_CPPFLAGS_MAINT_APPEND := -I/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+ export DEB_LDFLAGS_MAINT_APPEND := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+endif
+
CONFIGURE_FLAGS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
