This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository clustalo.
commit d986f73a772718ad12d27411a624d95667ce53af Author: Andreas Tille <[email protected]> Date: Tue Aug 30 08:46:09 2016 +0200 Try to deal with duplicate definition of log2 but failed --- debian/patches/log2.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 2 files changed, 18 insertions(+) diff --git a/debian/patches/log2.patch b/debian/patches/log2.patch new file mode 100644 index 0000000..05b3a86 --- /dev/null +++ b/debian/patches/log2.patch @@ -0,0 +1,17 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Tue, 30 Aug 2016 08:25:06 +0200 +Bug-Debian: https://bugs.debian.org/835074 +Description: Try to deal with duplicate definition of log2 but failed + +--- a/src/hhalign/util-C.h ++++ b/src/hhalign/util-C.h +@@ -51,7 +51,9 @@ inline int iround(double x) {return int( + inline double fmean(double x, double y, double d) { return pow( (pow(x,d)+pow(y,d))/2 ,1./d);} + + // log base 2 ++#ifndef HAVE_LOG2 + inline float log2(float x) {return (x<=0? (float)(-100000):1.442695041*log(x));} ++#endif + inline float log10(float x) {return (x<=0? (float)(-100000):0.434294481*log(x));} + + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3f441fe --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +log2.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/clustalo.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
