Source: ncl Version: 6.1.2-7 Severity: important Tags: patch User: [email protected] 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 iQEcBAEBCAAGBQJT2sYoAAoJEO/obGx//s+D8FMH/2Nc1eJFTw1hWdGwEGXTbUci YjjzIr5CAH3HXWEuQStsg1xtvovonyWtBMg2Q1EmP7eRQzSxLZHsx0ATZ5MWErBe yAFFffY29iB0klUF2WpmfqgujzaqbaoJrRxmJ3EVuKHSvc0xRiYPGOOntGaCn2c+ vgLDrVmmgVHK3eBB8z8Zz3q2ULMf4xiywYDXIOlPalQ4kqqL8PRW7U/JSMLO+obQ 3RpaK2x4yrUWiQAZBqG9t75KqsFFPgmGybRhs1+DYXmUx9wC+HZRb4HgcVZm8hmY lJHhQomIauMosUb1J9LskFR6hNeyNFQgAaUlFQkFjAl+HsJQ+xqOlvtBNWkJvtU= =fmAb -----END PGP SIGNATURE-----
diff -Nru ncl-6.1.2/debian/changelog ncl-6.1.2/debian/changelog --- ncl-6.1.2/debian/changelog 2014-03-25 15:55:44.000000000 +0100 +++ ncl-6.1.2/debian/changelog 2014-07-25 14:25:14.000000000 +0200 @@ -1,3 +1,10 @@ +ncl (6.1.2-7.1) unstable; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout. + + -- Gilles Filippini <[email protected]> Fri, 25 Jul 2014 14:25:14 +0200 + ncl (6.1.2-7) unstable; urgency=medium * Add support for kFreeBSD, Hurd to support-archs.patch diff -Nru ncl-6.1.2/debian/LINUX.DEBIAN ncl-6.1.2/debian/LINUX.DEBIAN --- ncl-6.1.2/debian/LINUX.DEBIAN 2014-03-25 15:55:44.000000000 +0100 +++ ncl-6.1.2/debian/LINUX.DEBIAN 2014-07-31 10:56:39.000000000 +0200 @@ -23,8 +23,12 @@ #define HDFlib -lmfhdfalt -ldfalt -ljpeg -lz #define HDFEOSlib -lhdfeos -lgctp #define HDFEOS5lib -lhe5_hdfeos -lgctp -#define HDF5lib -lhdf5_hl -lhdf5 -lz -#define NetCDF4lib -lhdf5_hl -lhdf5 +/* + * $(HDF5_LDFLAGS) must not be substitued before built time because + * of buggy ymake who replaces $arch and $system with "1" + */ +#define HDF5lib $(HDF5_LDFLAGS) -lhdf5_hl -lhdf5 -lz +#define NetCDF4lib $(HDF5_LDFLAGS) -lhdf5_hl -lhdf5 #define GDALlib -lgdal #define NoMakeDepend diff -Nru ncl-6.1.2/debian/rules ncl-6.1.2/debian/rules --- ncl-6.1.2/debian/rules 2014-03-25 15:55:44.000000000 +0100 +++ ncl-6.1.2/debian/rules 2014-07-31 10:57:17.000000000 +0200 @@ -21,6 +21,11 @@ FC := gfortran VERSION := 6.1.2 +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),) + CFLAGS += -I/usr/include/hdf5/serial + export HDF5_LDFLAGS := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial +endif + export LD_LIBRARY_PATH=$(TOPDIR)/shared:$(LIBDIR)/libfakeroot # We built it twice: first shared, to get the shared libraries (with -fpic -fPIC) @@ -46,7 +51,7 @@ sed -e 's/@CC@/${CC}/' \ -e 's/@FC@/${FC}/' \ -e 's/@LD@/${CC}/' \ - -e 's/@CFLAGS@/${CFLAGS}/' \ + -e 's:@CFLAGS@:${CFLAGS}:' \ -e 's/@FFLAGS@/${FFLAGS}/' \ -e 's/@CPPFLAGS@/${CPPFLAGS}/' \ -e 's/@LDFLAGS@/${LDFLAGS}/' \ @@ -55,7 +60,7 @@ sed -e 's/@CC@/${CC}/' \ -e 's/@FC@/${FC}/' \ -e 's/@LD@/${CC}/' \ - -e 's/@CFLAGS@/${CFLAGS}/' \ + -e 's:@CFLAGS@:${CFLAGS}:' \ -e 's/@FFLAGS@/${FFLAGS}/' \ -e 's/@CPPFLAGS@/${CPPFLAGS}/' \ -e 's/@LDFLAGS@/${LDFLAGS}/' \
