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

[Andreas Tille]

Author: tille
Date: 2014-02-25 08:04:55 +0000 (Tue, 25 Feb 2014)
New Revision: 16308

Modified:
   trunk/packages/ampliconnoise/trunk/debian/changelog
   trunk/packages/ampliconnoise/trunk/debian/patches/clang-ftbfs.patch
Log:
Fixed patch, mention move of upstream file, upload to unstable


Modified: trunk/packages/ampliconnoise/trunk/debian/changelog
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/changelog	2014-02-25 07:51:15 UTC (rev 16307)
+++ trunk/packages/ampliconnoise/trunk/debian/changelog	2014-02-25 08:04:55 UTC (rev 16308)
@@ -1,13 +1,17 @@
-ampliconnoise (1.29-2) UNRELEASED; urgency=low
+ampliconnoise (1.29-2) unstable; urgency=low
 
+  [ Arthur Marble ]
   * 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
+  [ James McCoy ]
+  * Moved debian/upstream to debian/upstream/metadata
 
+ -- Andreas Tille <tille at debian.org>  Tue, 25 Feb 2014 08:57:09 +0100
+
 ampliconnoise (1.29-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/ampliconnoise/trunk/debian/patches/clang-ftbfs.patch
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/patches/clang-ftbfs.patch	2014-02-25 07:51:15 UTC (rev 16307)
+++ trunk/packages/ampliconnoise/trunk/debian/patches/clang-ftbfs.patch	2014-02-25 08:04:55 UTC (rev 16308)
@@ -6,14 +6,14 @@
 --- 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;
-   
- }
- 
+   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*