Source: hdf-eos5 Version: 5.1.15.dfsg.1-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 iQEcBAEBCAAGBQJT2sHDAAoJEO/obGx//s+DpQEH/2BkdmOfJ3Jd8Fg9ZmGtjC5j O4bskOJ1etHsrBT1ShGyMnD2izh2TVdVBbX7mqk6qrpPjqBWadXij2DTD17vhln+ F47gP8HZ5mX/7FLPMhbs8Xv408/F/FulE1YCK2/KUWeorj2B5qRsf188sf+J1QHx b3/KAHmimHJHsaiFA3281p7Iyn+3u1ZcdrZFdsQc5qb+f8nVwzuobqsrjNEC7uXX OT/fcBdU3b0srSuszLc3Hpaw2iotAHAtW9rFnWHKHJ8IPaK3Kf/nJWB1K+THezES L2NZqv95um84A2AMlaHwv3aMqCP0VivYY11omC1wbms8VGTsN5uZnSs3AOLB9I8= =/i6N -----END PGP SIGNATURE-----
diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/changelog hdf-eos5-5.1.15.dfsg.1/debian/changelog --- hdf-eos5-5.1.15.dfsg.1/debian/changelog 2014-07-08 14:00:31.000000000 +0200 +++ hdf-eos5-5.1.15.dfsg.1/debian/changelog 2014-07-25 11:19:40.000000000 +0200 @@ -1,3 +1,11 @@ +hdf-eos5 (5.1.15.dfsg.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout. + * Fix patch libtool_fixes.patch to not drop predefined LDFLAGS. + + -- Gilles Filippini <p...@debian.org> Fri, 25 Jul 2014 11:17:50 +0200 + hdf-eos5 (5.1.15.dfsg.1-2) unstable; urgency=medium * Fix for missing function H5_EHHEisHE5 : misplaced ifdef. diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/patches/hdf_hl.patch hdf-eos5-5.1.15.dfsg.1/debian/patches/hdf_hl.patch --- hdf-eos5-5.1.15.dfsg.1/debian/patches/hdf_hl.patch 2014-07-08 14:00:31.000000000 +0200 +++ hdf-eos5-5.1.15.dfsg.1/debian/patches/hdf_hl.patch 2014-07-25 11:22:09.000000000 +0200 @@ -24,7 +24,7 @@ @@ -11,6 +11,7 @@ # Set LDFLAGS to allow the HDF-EOS library to use extern variables from # HDF5 - LDFLAGS= -shrext .so + LDFLAGS+= -shrext .so +LIBS= -lgctp -lhdf5_hl -lhdf5 -lm # Build HDF-EOS5 diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/patches/libtool_fixes.patch hdf-eos5-5.1.15.dfsg.1/debian/patches/libtool_fixes.patch --- hdf-eos5-5.1.15.dfsg.1/debian/patches/libtool_fixes.patch 2014-07-08 14:00:31.000000000 +0200 +++ hdf-eos5-5.1.15.dfsg.1/debian/patches/libtool_fixes.patch 2014-07-25 11:20:56.000000000 +0200 @@ -12,7 +12,7 @@ # Set LDFLAGS to allow the HDF-EOS library to use extern variables from # HDF5 -LDFLAGS=-Wl,-single_module -+LDFLAGS= -shrext .so ++LDFLAGS+= -shrext .so # Build HDF-EOS5 lib_LTLIBRARIES=libhe5_hdfeos.la diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/rules hdf-eos5-5.1.15.dfsg.1/debian/rules --- hdf-eos5-5.1.15.dfsg.1/debian/rules 2014-07-08 14:00:31.000000000 +0200 +++ hdf-eos5-5.1.15.dfsg.1/debian/rules 2014-07-31 10:01:08.000000000 +0200 @@ -13,11 +13,16 @@ # Disable checks: known bad test case ignored this release DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --with-pic + +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),) + DEB_CONFIGURE_EXTRA_FLAGS += --with-hdf5=/usr/include/hdf5/serial,/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial +endif + export DEB_CFLAGS_MAINT_APPEND=-D_HDFEOS5_THREADSAFE -D_HDFEOS5_THREADSAFE -Df2cFortran -I/usr/include/hdf export DEB_LDFLAGS_MAINT_APPEND=-lpthread -override_dh_configure: - dh_configure -- --enable-shared --with-pic +override_dh_auto_configure: + dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) # Needed for the pthreads tests cp samples/simple.txt testdrivers/threads
