[med-svn] [clustalo] 04/06: Upstream has applied patches

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository clustalo.

commit 63324d1c0acb4ec1c8d1854d806d734c95fcc727
Author: Andreas Tille <tille at debian.org>
Date:   Wed Dec 21 21:05:29 2016 +0100

    Upstream has applied patches
---
 debian/patches/log2.patch | 33 ---------------------------------
 debian/patches/series     |  1 -
 2 files changed, 34 deletions(-)

diff --git a/debian/patches/log2.patch b/debian/patches/log2.patch
deleted file mode 100644
index 68b2f33..0000000
--- a/debian/patches/log2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Tue, 30 Aug 2016 08:25:06 +0200
-Bug-Debian: https://bugs.debian.org/835074
-Description: Deal with duplicate definition of log2
- Remark: Even after including config.h
-      #ifndef CLUSTAL_OMEGA_HAVE_LOG2
- worked in src/hhalign/util-C.h - no idea why.  So the definitions
- were simply turned into comments.
-
---- a/src/hhalign/util-C.h
-+++ b/src/hhalign/util-C.h
-@@ -51,8 +51,10 @@ 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
-+/*
- inline float log2(float x)  {return (x<=0? (float)(-100000):1.442695041*log(x));}
- inline float log10(float x) {return (x<=0? (float)(-100000):0.434294481*log(x));}
-+*/
- 
- 
- /////////////////////////////////////////////////////////////////////////////////////
---- a/src/clustal/mbed.c
-+++ b/src/clustal/mbed.c
-@@ -88,7 +88,7 @@ static const int RESTARTS_PER_SPLIT = 10
- #define USE_KMEANS_LLOYDS 0
- 
- 
--#ifndef HAVE_LOG2
-+#ifndef CLUSTAL_OMEGA_HAVE_LOG2
- #define log2(x)  (log(x) / 0.69314718055994530942)
- #endif
- #define NUMBER_OF_SEEDS(n) pow(log2(((double)n)), 2)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3f441fe..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-log2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/clustalo.git