Control: tags 960010 + patch Dear maintainer,
I've prepared an NMU for freefem++ (versioned as 3.61.1+dfsg1-5.1). The diff is attached to this message. Regards, SR
diff -Nru freefem++-3.61.1+dfsg1/debian/changelog freefem++-3.61.1+dfsg1/debian/changelog --- freefem++-3.61.1+dfsg1/debian/changelog 2019-10-05 00:21:24.000000000 -0700 +++ freefem++-3.61.1+dfsg1/debian/changelog 2020-05-17 13:41:04.000000000 -0700 @@ -1,3 +1,10 @@ +freefem++ (3.61.1+dfsg1-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with gsl 2.6 (Closes: #960010) + + -- Stefano Rivera <stefa...@debian.org> Sun, 17 May 2020 13:41:04 -0700 + freefem++ (3.61.1+dfsg1-5) unstable; urgency=medium * Team upload. diff -Nru freefem++-3.61.1+dfsg1/debian/patches/double-cblas-import.patch freefem++-3.61.1+dfsg1/debian/patches/double-cblas-import.patch --- freefem++-3.61.1+dfsg1/debian/patches/double-cblas-import.patch 1969-12-31 16:00:00.000000000 -0800 +++ freefem++-3.61.1+dfsg1/debian/patches/double-cblas-import.patch 2020-05-17 13:21:25.000000000 -0700 @@ -0,0 +1,25 @@ +Description: Avoid FTBFS with gsl 2.6 by including 2 incompatible cblas headers +Bug-Debian: https://bugs.debian.org/960010 +Author: Frederic Hecht <frederic.he...@upmc.fr> +Origin: upstream, https://github.com/FreeFem/FreeFem-sources/commit/3bfe3eb669c580583e9290474614b45cee52a96c + +--- a/src/femlib/MatriceCreuse_tpl.hpp ++++ b/src/femlib/MatriceCreuse_tpl.hpp +@@ -12,7 +12,7 @@ + // test blas + // on MacOS9 under MWERKS + // cblas_ddot macos-9 is not +-#ifdef HAVE_CBLAS_H ++#ifdef HAVE_CBLAS_H_BUG + extern "C" { + #define FF_VERSION VERSION + #undef VERSION +@@ -21,7 +21,7 @@ + #define VERSION VERSION + } + #define WITHBLAS 1 +-#elif HAVE_VECLIB_CBLAS_H ++#elif HAVE_VECLIB_CBLAS_BUG + #include <vecLib/cblas.h> + #define WITHBLAS 1 + #endif diff -Nru freefem++-3.61.1+dfsg1/debian/patches/series freefem++-3.61.1+dfsg1/debian/patches/series --- freefem++-3.61.1+dfsg1/debian/patches/series 2019-10-05 00:21:24.000000000 -0700 +++ freefem++-3.61.1+dfsg1/debian/patches/series 2020-05-17 13:17:38.000000000 -0700 @@ -3,3 +3,4 @@ examples++-load.patch src_fflib.patch fix_all.edp.patch +double-cblas-import.patch
