[med-svn] r16740 - in trunk/packages/srf/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-04-20 21:40:06 +0000 (Sun, 20 Apr 2014)
New Revision: 16740

Added:
   trunk/packages/srf/trunk/debian/patches/clang_FTBFS_wrong-main-declaration.patch
Modified:
   trunk/packages/srf/trunk/debian/changelog
   trunk/packages/srf/trunk/debian/patches/series
Log:
Fix FTBFS with clang


Modified: trunk/packages/srf/trunk/debian/changelog
===================================================================
--- trunk/packages/srf/trunk/debian/changelog	2014-04-20 08:44:58 UTC (rev 16739)
+++ trunk/packages/srf/trunk/debian/changelog	2014-04-20 21:40:06 UTC (rev 16740)
@@ -1,3 +1,11 @@
+srf (0.1+dfsg-3) UNRELEASED; urgency=medium
+
+  * Fix FTBFS with clang (thanks for the patch to
+    Nicolas Sévelin-Radiguet <nicosr at free.fr>)
+    Closes: #745350
+
+ -- Andreas Tille <tille at debian.org>  Sun, 20 Apr 2014 23:38:02 +0200
+
 srf (0.1+dfsg-2) unstable; urgency=low
 
   * Update to recent packaging standards and rebuild

Added: trunk/packages/srf/trunk/debian/patches/clang_FTBFS_wrong-main-declaration.patch
===================================================================
--- trunk/packages/srf/trunk/debian/patches/clang_FTBFS_wrong-main-declaration.patch	                        (rev 0)
+++ trunk/packages/srf/trunk/debian/patches/clang_FTBFS_wrong-main-declaration.patch	2014-04-20 21:40:06 UTC (rev 16740)
@@ -0,0 +1,68 @@
+Description: fix FTBFS with clang instead of gcc
+Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
+Last-Update: 2014-04-20
+
+--- a/test/testRead.cc
++++ b/test/testRead.cc
+@@ -29,7 +29,7 @@
+ }
+ 
+ 
+-main(int argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+     if ( argc != 2 )
+     {
+@@ -65,4 +65,5 @@
+     {
+         read->dump();
+     }
++    return 0;
+ }
+--- a/test/testWrite.cc
++++ b/test/testWrite.cc
+@@ -21,7 +21,7 @@
+   return oss.str();
+ }   
+ 
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+     SRF_File::openType mode = SRF_File::openTypeWrite;
+     SRF_File file( "myFirstSSRFFile", mode );
+--- a/test/testWriteFastaq.cc
++++ b/test/testWriteFastaq.cc
+@@ -22,7 +22,7 @@
+ #include <io_lib/ztr.h>
+ #include <zlib.h>
+ 
+-main(int argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+     if ( argc != 3 )
+     {
+@@ -115,5 +115,6 @@
+         }
+     }
+     newReadSet.write( file.getFile(), ztrBlobs, readIds );
++    return 0;
+ }
+ 
+--- a/test/testWriteSFF.cc
++++ b/test/testWriteSFF.cc
+@@ -31,7 +31,7 @@
+   return oss.str();
+ }   
+ 
+-main(int argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+     if ( argc != 3 )
+     {
+@@ -75,5 +75,6 @@
+         readIdCounter++;
+     }
+     newReadSet.write( file.getFile(), ztrBlobs, readIds );
++    return 0;
+ }
+ 

Modified: trunk/packages/srf/trunk/debian/patches/series
===================================================================
--- trunk/packages/srf/trunk/debian/patches/series	2014-04-20 08:44:58 UTC (rev 16739)
+++ trunk/packages/srf/trunk/debian/patches/series	2014-04-20 21:40:06 UTC (rev 16740)
@@ -1,2 +1,3 @@
 build_with_GCC-4.3.patch
 io_lib_renamed.patch
+clang_FTBFS_wrong-main-declaration.patch