Source: xdmf
Version: 2.1.dfsg.1-9
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
iQEcBAEBCAAGBQJT2skGAAoJEO/obGx//s+DlAwH/31Wj7f9fBr4Fdj5KgAiPZr7
MxQca/IrDTQX6ektMUfmicgW+mqj0i/yd/FvEARpDaSkoEjK3t7W4fNWehXKqn6r
GIwDH2Y99F2UkJ58lSAJJle5ZQN3uP2KvRyKB+jIYpjE5cIUlWqHdApWtaTAy/7t
NQFyAVfpPR+5jmcT716828VYwfCT7j66sYpwEjKFnam+69oGtS4Udw6acA+pcdhR
oHrsYEad3NIUnIF7NLzQ6S2PUmA82hT9I+tX4c1Pt3PoPteu8dscplVseUNkrZDY
R4KvXvXW8jcOsjxW2wbo867xSMTj/Qhm4C5n2nj/PrPlXeFfqa9gMaqdc9yhMcM=
=sCui
-----END PGP SIGNATURE-----
diff -Nru xdmf-2.1.dfsg.1/debian/changelog xdmf-2.1.dfsg.1/debian/changelog
--- xdmf-2.1.dfsg.1/debian/changelog 2014-05-30 01:54:56.000000000 +0200
+++ xdmf-2.1.dfsg.1/debian/changelog 2014-07-26 19:45:05.000000000 +0200
@@ -1,3 +1,10 @@
+xdmf (2.1.dfsg.1-9.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <p...@debian.org> Sat, 26 Jul 2014 19:45:05 +0200
+
xdmf (2.1.dfsg.1-9) unstable; urgency=medium
* Build VTK reader libraries.
diff -Nru xdmf-2.1.dfsg.1/debian/rules xdmf-2.1.dfsg.1/debian/rules
--- xdmf-2.1.dfsg.1/debian/rules 2014-05-30 01:54:56.000000000 +0200
+++ xdmf-2.1.dfsg.1/debian/rules 2014-07-31 19:12:01.000000000 +0200
@@ -14,6 +14,13 @@
TCLVER:=tcl8.6
PYTHON_LIB:=/usr/lib/${DEB_HOST_MULTIARCH)}/lib${PYVER}.so
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+ HDF5_INC := /usr/include/hdf5/serial
+ HDF5_LIB := /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so
+else
+ HDF5_INC := /usr/include
+ HDF5_LIB := /usr/lib/$(DEB_HOST_MULTIARCH)/libhdf5.so
+endif
CXXFLAGS:= -I/usr/include/${PYVER} -I/usr/include/${TCLVER} ${CXXFLAGS}
@@ -26,7 +33,9 @@
-DXDMF_WRAP_PYTHON=ON \
-DXDMF_BUILD_VTK=ON -DVTK_USE_SYSTEM_ZLIB=ON \
-DPYTHON_INCLUDE_PATH="/usr/include/${PYVER}" \
- -DPYTHON_LIBRARY=${PYTHON_LIB}
+ -DPYTHON_LIBRARY=${PYTHON_LIB} \
+ -DHDF5_INCLUDE_PATH=$(HDF5_INC) \
+ -DHDF5_LIBRARY=$(HDF5_LIB)
# -DXDMF_SYSTEM_HDF5=ON -DXDMF_SYSTEM_HDF5_IS_PARALLEL=ON \
