[med-svn] [Git][med-team/clonalframe][master] 4 commits: comment out erroneous unused code which breaks build with glibc 2.27

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / clonalframe


Commits:
238383d9 by Andreas Tille at 2018-03-05T17:14:27+01:00
comment out erroneous unused code which breaks build with glibc 2.27

- - - - -
87b5e2e3 by Andreas Tille at 2018-03-05T17:14:53+01:00
Standards-Version: 4.1.3

- - - - -
42756f8b by Andreas Tille at 2018-03-05T17:15:30+01:00
debhelper 11

- - - - -
e6243b10 by Andreas Tille at 2018-03-05T17:20:41+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/glibc2.27.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-clonalframe (1.2-8) UNRELEASED; urgency=medium
+clonalframe (1.2-8) unstable; urgency=medium
 
+  [ Adrian Bunk ]
+  * comment out erroneous unused code which breaks build with glibc 2.27
+    Closes: #891335
+
+  [ Andreas Tille ]
   * cme fix dpkg-copyright
+  * Standards-Version: 4.1.3
+  * debhelper 11
 
- -- Andreas Tille <tille at debian.org>  Wed, 28 Feb 2018 11:24:06 +0100
+ -- Andreas Tille <tille at debian.org>  Mon, 05 Mar 2018 17:15:32 +0100
 
 clonalframe (1.2-7) unstable; urgency=medium
 


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                qt5-qmake,
                libgsl-dev
-Standards-Version: 4.1.0
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/clonalframe.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/clonalframe.git
 Homepage: http://www.xavierdidelot.xtreemhost.com/clonalframe.htm


=====================================
debian/patches/glibc2.27.patch
=====================================
--- /dev/null
+++ b/debian/patches/glibc2.27.patch
@@ -0,0 +1,34 @@
+Description: Comment out Util::lBinoProb()
+ The code didn't make sense, causes FTBFS with glibc >= 2.27 and was unused.
+Author: Adrian Bunk <bunk at debian.org>
+Bug-Debian: https://bugs.debian.org/891335
+
+--- clonalframe-1.2.orig/src/util.cpp
++++ clonalframe-1.2/src/util.cpp
+@@ -93,6 +93,7 @@ fclose(f);
+     }
+ 
+ 
++#if 0
+     double Util::lBinoProb (int i,int n, double p)
+             /*returns the prob of i successes in n trials with prob of sucess p.*/
+     {
+@@ -149,6 +150,7 @@ fclose(f);
+ 
+         return logsum;
+     }
++#endif  /* 0 */
+ 
+ 
+     double Util::lbetapdf(double x,double a,double b)
+--- clonalframe-1.2.orig/src/util.h
++++ clonalframe-1.2/src/util.h
+@@ -56,7 +56,7 @@ namespace wb {
+         static void normalize(gsl_vector * v);
+         static void normalize(double *v,int size);
+         static int  vecsum_char(gsl_vector_char * vec);
+-        static double lBinoProb (int i,int n, double p);
++        //static double lBinoProb (int i,int n, double p);
+         static double lbetapdf(double x,double a,double b);
+         static double mylgamma(double z);
+         static double LDirichletProb(double prior[],double post[],int length);


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_gcc-4.6.patch
 no_qtlibs.patch
+glibc2.27.patch



View it on GitLab: https://salsa.debian.org/med-team/clonalframe/compare/f3caa7a617809a722bfd486cf85710700e046c31...e6243b10758e74f121e6cb88b3f26837af0be0e9

---
View it on GitLab: https://salsa.debian.org/med-team/clonalframe/compare/f3caa7a617809a722bfd486cf85710700e046c31...e6243b10758e74f121e6cb88b3f26837af0be0e9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180305/43e16c75/attachment-0001.html>