[Pkg-octave-devel] Bug#756704: dynare: [hdf5 transition] please support hdf5 1.8.13 new packaging layout

[Gilles Filippini <pini@debian.org>]

Source: dynare
Version: 4.4.2-2
Severity: important
Tags: patch
User: pini@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

iQEcBAEBCAAGBQJT2smUAAoJEO/obGx//s+D7Q0IAJhap5BdDsIKqGlSiEd32P5K
aScHDSoZfCgfn331oW56Jf2UEYghhqYujMPPPqr/ofigxv/1+Iu9P6olkwJxDTjS
EDEtEnJOSeoLwEf5xSdheQIcr+zHM6UjZ3T6/rU07to/MQpae2W5zFxXrRjBz9Zm
eJbg/FLSfymVEXrLBX2Rr6GOSyAb/I2zekWQvfoSGTkGHZUzkv1+vK5CKIG4B+6t
nh4f/lbIIfWvgWiB8i+MMuUC87HVKoIPc/8CjFEaJHSNv1GkYd+EDSw0JL2NcT9r
YiFImEvRcKo4h3bWmpecJaCNOj68eaO7JDOnrkw5lXMDQvtcww0DwXKAXCDn7uA=
=NF5y
-----END PGP SIGNATURE-----

diff -Nru dynare-4.4.2/debian/changelog dynare-4.4.2/debian/changelog
--- dynare-4.4.2/debian/changelog	2014-03-24 17:41:45.000000000 +0100
+++ dynare-4.4.2/debian/changelog	2014-07-27 22:13:48.000000000 +0200
@@ -1,3 +1,10 @@
+dynare (4.4.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <pini@debian.org>  Sun, 27 Jul 2014 22:13:48 +0200
+
 dynare (4.4.2-2) unstable; urgency=medium
 
   * dynare-matlab: add missing dependency on libmatio-dev. (Closes: #742259)
diff -Nru dynare-4.4.2/debian/rules dynare-4.4.2/debian/rules
--- dynare-4.4.2/debian/rules	2013-12-16 16:25:05.000000000 +0100
+++ dynare-4.4.2/debian/rules	2014-07-31 19:15:16.000000000 +0200
@@ -2,6 +2,10 @@
 
 include /usr/share/octave/debian/defs.make
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  export DEB_CPPFLAGS_MAINT_APPEND := -I/usr/include/hdf5/serial
+endif
+
 %:
 	dh $@ --parallel --with autoreconf