Thanks for the patch. It's been applied in the master and 0.14 branches: https://github.com/neurodroid/stimfit/commit/b589dea2
Please review. Is any further action required from my side?
Best
Christoph
On Fri, Aug 01, 2014 at 12:51:44AM +0200, Gilles Filippini wrote:
> Source: stimfit
> Version: 0.13.15-1
> 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
>
> iQEcBAEBCAAGBQJT2siAAAoJEO/obGx//s+D+/cIAI0VMcAi9lDdXWo3SbgaxOq8
> GZjnQwlx205d9iSRars99A/GRaqlcJp2Iug4IDjafZFP5vJCReh9lsFRHzjvC8P1
> zDplOr9TT2BrTkEvZ83RY9qWvCaZJR6UlQc7+Az4/XQiAyRNbVZxL1cNseroBWhu
> 6oyUAbijjkWjPKCa/ADdeQNFz4k+ORobruNn0qpgV3MI0wvS8Qat/MtL/lM31ROk
> /CAzuC1rrJ4mRvwuONLWmp4pguC9UcsEj9VYO5/3f3+IG4n1vw31I7TcsPVpI2Ck
> K2cYS0AAFisaHyIlJ293aou+mZB1XsR5yspBHlQCWF4DYNTopIfckJ3sXL/hHuM=
> =D9il
> -----END PGP SIGNATURE-----
> diff -Nru stimfit-0.13.15/debian/changelog stimfit-0.13.15/debian/changelog
> --- stimfit-0.13.15/debian/changelog 2014-02-16 14:23:17.000000000 +0100
> +++ stimfit-0.13.15/debian/changelog 2014-07-26 20:24:11.000000000 +0200
> @@ -1,3 +1,12 @@
> +stimfit (0.13.15-1.1) unstable; urgency=low
> +
> + * Non-maintainer upload.
> + * Support hdf5 1.8.13 new packaging layout.
> + * New patch fix-enable-debian.patch to support dpkg-buildflags with
> + --enable-module.
> +
> + -- Gilles Filippini <p...@debian.org> Sat, 26 Jul 2014 18:48:03 +0200
> +
> stimfit (0.13.15-1) unstable; urgency=low
>
> * Fix half duration limits bug
> diff -Nru stimfit-0.13.15/debian/patches/fix-enable-debian.patch
> stimfit-0.13.15/debian/patches/fix-enable-debian.patch
> --- stimfit-0.13.15/debian/patches/fix-enable-debian.patch 1970-01-01
> 01:00:00.000000000 +0100
> +++ stimfit-0.13.15/debian/patches/fix-enable-debian.patch 2014-07-26
> 20:22:45.000000000 +0200
> @@ -0,0 +1,26 @@
> +Index: stimfit-0.13.15/configure.ac
> +===================================================================
> +--- stimfit-0.13.15.orig/configure.ac 2014-02-16 13:38:45.000000000
> +0100
> ++++ stimfit-0.13.15/configure.ac 2014-07-26 20:22:40.900894278 +0200
> +@@ -100,15 +100,17 @@
> + else
> + if test "$enable_debian" = "yes" ; then
> + LIBSTF_LDFLAGS="-Wl,-rpath,/usr/lib/stimfit -avoid-version"
> +- CPPFLAGS="${CPPFLAGS} `dpkg-buildflags --get CPPFLAGS`"
> +- CFLAGS="${CFLAGS} `dpkg-buildflags --get CFLAGS`"
> +- CXXFLAGS="${CXXFLAGS} `dpkg-buildflags --get CXXFLAGS`"
> +- LDFLAGS="${LDFLAGS} `dpkg-buildflags --get LDFLAGS`"
> + else
> + LIBSTF_LDFLAGS="-Wl,-rpath,${prefix}/lib/stimfit
> -avoid-version"
> + fi
> + CPPFLAGS="${CPPFLAGS}"
> + fi
> ++ if test "$enable_debian" = "yes" ; then
> ++ CPPFLAGS="${CPPFLAGS} `dpkg-buildflags --get CPPFLAGS`"
> ++ CFLAGS="${CFLAGS} `dpkg-buildflags --get CFLAGS`"
> ++ CXXFLAGS="${CXXFLAGS} `dpkg-buildflags --get CXXFLAGS`"
> ++ LDFLAGS="${LDFLAGS} `dpkg-buildflags --get LDFLAGS`"
> ++ fi
> + STF_PYTHON_LIBNAME="libpystf.so"
> + STFIO_PYTHON_LIBNAME="libpystfio.so"
> + ;;
> diff -Nru stimfit-0.13.15/debian/patches/series
> stimfit-0.13.15/debian/patches/series
> --- stimfit-0.13.15/debian/patches/series 1970-01-01 01:00:00.000000000
> +0100
> +++ stimfit-0.13.15/debian/patches/series 2014-07-26 20:21:50.000000000
> +0200
> @@ -0,0 +1 @@
> +fix-enable-debian.patch
> diff -Nru stimfit-0.13.15/debian/rules stimfit-0.13.15/debian/rules
> --- stimfit-0.13.15/debian/rules 2014-02-16 14:23:17.000000000 +0100
> +++ stimfit-0.13.15/debian/rules 2014-07-31 18:39:53.000000000 +0200
> @@ -15,6 +15,11 @@
> MAKEFLAGS += -j$(NUMJOBS)
> endif
>
> +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
> + export DEB_CPPFLAGS_MAINT_APPEND := -I/usr/include/hdf5/serial
> + export DEB_LDFLAGS_MAINT_APPEND :=
> -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
> +endif
> +
> build: build-arch build-indep
> build-arch: build-stamp
> build-indep: build-stamp
pgpycjeThjknG.pgp
Description: PGP signature
