[med-svn] r16307 - in trunk/packages/ampliconnoise/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-02-25 07:51:15 +0000 (Tue, 25 Feb 2014)
New Revision: 16307

Added:
   trunk/packages/ampliconnoise/trunk/debian/patches/clang-ftbfs.patch
Modified:
   trunk/packages/ampliconnoise/trunk/debian/changelog
   trunk/packages/ampliconnoise/trunk/debian/patches/series
Log:
Fix FTBFS with clang instead of gcc


Modified: trunk/packages/ampliconnoise/trunk/debian/changelog
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/changelog	2014-02-24 18:54:45 UTC (rev 16306)
+++ trunk/packages/ampliconnoise/trunk/debian/changelog	2014-02-25 07:51:15 UTC (rev 16307)
@@ -1,3 +1,13 @@
+ampliconnoise (1.29-2) UNRELEASED; urgency=low
+
+  * Fix the FTBFS with clang:
+    - Fixed the non-void function should return a value in
+      FCluster/FCluster.c
+      SplitClusterEven/SplitClusterEven.c
+    Closes: #740029
+
+ -- Arthur Marble <arthur at info9.net>  Mon, 24 Feb 2014 19:01:09 -0600
+
 ampliconnoise (1.29-1) unstable; urgency=medium
 
   * New upstream version

Added: trunk/packages/ampliconnoise/trunk/debian/patches/clang-ftbfs.patch
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/patches/clang-ftbfs.patch	                        (rev 0)
+++ trunk/packages/ampliconnoise/trunk/debian/patches/clang-ftbfs.patch	2014-02-25 07:51:15 UTC (rev 16307)
@@ -0,0 +1,36 @@
+Author: Arthur Marble <arthur at info9.net>
+Last-Update: Mon, 24 Feb 2014 19:06:10 -0600
+Bug-Debian: http://bugs.debian.org/740029
+Description: Fix FTBFS with clang instead of gcc
+
+--- a/FCluster/FCluster.c
++++ b/FCluster/FCluster.c
+@@ -857,7 +857,7 @@ int outputCluster(t_Params *ptParams, t_
+   free(anIndex); 
+   free(szOtuFile);
+   free(szListFile);
+-  return;
++  return 0;
+   
+ }
+ 
+--- a/SplitClusterEven/SplitClusterEven.c
++++ b/SplitClusterEven/SplitClusterEven.c
+@@ -375,7 +375,7 @@ double maxDepth(t_Node* ptTree, double*
+     maxDepth(ptTree->ptLeft, pdDepth);
+   }
+ 
+-  return;
++  return 0;
+ }
+ 
+ double setDepth(t_Node* ptTree, double dDepth)
+@@ -390,7 +390,7 @@ double setDepth(t_Node* ptTree, double d
+     setDepth(ptTree->ptRight, dDepth + ptTree->dRight);
+   }
+ 
+-  return;
++  return 0;
+ }
+ 
+ void writeIndices(t_Node* ptTree, FILE* ofp)

Modified: trunk/packages/ampliconnoise/trunk/debian/patches/series
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/patches/series	2014-02-24 18:54:45 UTC (rev 16306)
+++ trunk/packages/ampliconnoise/trunk/debian/patches/series	2014-02-25 07:51:15 UTC (rev 16307)
@@ -1,3 +1,4 @@
 fix-path-for-data.patch
 fix-segfault-on-non-fasta-input.patch
 hardening.patch
+clang-ftbfs.patch