Source: r-cran-hdf5
Version: 1.6.10-2
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
iQEcBAEBCAAGBQJT2sfEAAoJEO/obGx//s+D5MMH/3n1QTQrKMpIQlV15TVWDoOV
kYz/exF6YFoZwAah+VHYuaadVH8RR5Aoru+b5CxdPO8rOhTp/UsDemdib/fQkMs2
g+5wp2nmV70TOQVL8p60UT0IllzzXZQ2H64e1ryHlSASZfWbeI+4wxQs4c+zjz2H
XmG7idw7z04KnyvN+pvE37TuPPIe7EVGOFosyWOMKJAHnbjn8MR2cT7xLWv0bjZF
Ot1WpJBobDTWVTMpP2q/muN+Na7cdt0QLdqfWrz63G71nF1QKsWnLMWXlu2qkb8R
7m4ZEYmeJO2xcMrzUt94UAoktrXgwA1KoyYomNQZpsYF1VaxVpLQ0GM0siDohj8=
=myPg
-----END PGP SIGNATURE-----
diff -Nru r-cran-hdf5-1.6.10/debian/changelog r-cran-hdf5-1.6.10/debian/changelog
--- r-cran-hdf5-1.6.10/debian/changelog 2014-07-31 20:05:40.000000000 +0200
+++ r-cran-hdf5-1.6.10/debian/changelog 2014-07-26 15:38:05.000000000 +0200
@@ -1,3 +1,11 @@
+r-cran-hdf5 (1.6.10-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Support hdf5 1.8.13 new packaging layout.
+ * New patch with-hdf5.patch: fix HDF5LDFLAGS in configure.in.
+
+ -- Gilles Filippini <p...@debian.org> Sat, 26 Jul 2014 15:33:24 +0200
+
r-cran-hdf5 (1.6.10-2) unstable; urgency=low
* debian/control: Set Build-Depends: to current R version
diff -Nru r-cran-hdf5-1.6.10/debian/patches/series r-cran-hdf5-1.6.10/debian/patches/series
--- r-cran-hdf5-1.6.10/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ r-cran-hdf5-1.6.10/debian/patches/series 2014-07-26 15:35:23.000000000 +0200
@@ -0,0 +1 @@
+with-hdf5.patch
diff -Nru r-cran-hdf5-1.6.10/debian/patches/with-hdf5.patch r-cran-hdf5-1.6.10/debian/patches/with-hdf5.patch
--- r-cran-hdf5-1.6.10/debian/patches/with-hdf5.patch 1970-01-01 01:00:00.000000000 +0100
+++ r-cran-hdf5-1.6.10/debian/patches/with-hdf5.patch 2014-07-26 15:45:04.000000000 +0200
@@ -0,0 +1,26 @@
+Index: r-cran-hdf5-1.6.10/configure.in
+===================================================================
+--- r-cran-hdf5-1.6.10.orig/configure.in 2011-05-11 02:02:04.000000000 +0200
++++ r-cran-hdf5-1.6.10/configure.in 2014-07-26 15:36:44.251388180 +0200
+@@ -15,7 +15,7 @@
+ if test -n "$with_hdf5"; then
+ HDF5LDFLAGS="-L${with_hdf5}/lib"
+ if test `uname -s` != "Darwin"; then
+- HDF5LDFLAGS="-Wl,-rpath,${with_hdf5}/lib"
++ HDF5LDFLAGS="-Wl,-L,${with_hdf5}/lib"
+ fi
+ HDF5CPPFLAGS=-I${with_hdf5}/include
+ fi
+Index: r-cran-hdf5-1.6.10/configure
+===================================================================
+--- r-cran-hdf5-1.6.10.orig/configure 2011-05-11 02:02:04.000000000 +0200
++++ r-cran-hdf5-1.6.10/configure 2014-07-26 15:44:58.304739655 +0200
+@@ -2201,7 +2201,7 @@
+ if test -n "$with_hdf5"; then
+ HDF5LDFLAGS="-L${with_hdf5}/lib"
+ if test `uname -s` != "Darwin"; then
+- HDF5LDFLAGS="-Wl,-rpath,${with_hdf5}/lib"
++ HDF5LDFLAGS="-Wl,-L,${with_hdf5}/lib"
+ fi
+ HDF5CPPFLAGS=-I${with_hdf5}/include
+ fi
diff -Nru r-cran-hdf5-1.6.10/debian/rules r-cran-hdf5-1.6.10/debian/rules
--- r-cran-hdf5-1.6.10/debian/rules 2014-07-31 20:05:40.000000000 +0200
+++ r-cran-hdf5-1.6.10/debian/rules 2014-07-31 15:38:31.000000000 +0200
@@ -5,5 +5,6 @@
include /usr/share/R/debian/r-cran.mk
-
-
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+ extraInstallFlags := "--configure-args=--with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial"
+endif
diff -Nru r-cran-hdf5-1.6.10/debian/source/format r-cran-hdf5-1.6.10/debian/source/format
--- r-cran-hdf5-1.6.10/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ r-cran-hdf5-1.6.10/debian/source/format 2014-07-26 16:40:37.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
