[med-svn] r8510 - in trunk/packages/mothur/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-11-10 08:14:05 +0000 (Thu, 10 Nov 2011)
New Revision: 8510

Added:
   trunk/packages/mothur/trunk/debian/patches/drop_sse_option.patch
Modified:
   trunk/packages/mothur/trunk/debian/changelog
   trunk/packages/mothur/trunk/debian/patches/makefile.patch
   trunk/packages/mothur/trunk/debian/patches/no_lcurses.patch
   trunk/packages/mothur/trunk/debian/patches/series
Log:
New upstream version and fix for FTBFS (-msse)


Modified: trunk/packages/mothur/trunk/debian/changelog
===================================================================
--- trunk/packages/mothur/trunk/debian/changelog	2011-11-10 07:19:10 UTC (rev 8509)
+++ trunk/packages/mothur/trunk/debian/changelog	2011-11-10 08:14:05 UTC (rev 8510)
@@ -1,3 +1,13 @@
+mothur (1.22.2-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/patches/drop_sse_option.patch: Fix for FTBFS: unrecognized
+    command line option '-msse2' (Thanks for the patch to
+    Nobuhiro Iwamatsu <iwamatsu at nigauri.org>)
+    Closes: #648255
+
+ -- Andreas Tille <tille at debian.org>  Thu, 10 Nov 2011 08:38:32 +0100
+
 mothur (1.22.1-1) unstable; urgency=low
 
   [ Thorsten Alteholz ]

Added: trunk/packages/mothur/trunk/debian/patches/drop_sse_option.patch
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/drop_sse_option.patch	                        (rev 0)
+++ trunk/packages/mothur/trunk/debian/patches/drop_sse_option.patch	2011-11-10 08:14:05 UTC (rev 8510)
@@ -0,0 +1,15 @@
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Date: Thu, 10 Nov 2011 00:39:01 UTC
+Closes: #648255
+Description: Fix for FTBFS: cc1plus: error: unrecognized command line option '-msse2'
+--- mothur-1.22.2.orig/uchime_src/mk
++++ mothur-1.22.2/uchime_src/mk
+@@ -7,7 +7,7 @@
+ for CPPName in $CPPNames
+ do
+   echo $CPPName >> /dev/tty
+-  g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 -DUCHIMES=1 $CPPName.cpp -o $CPPName.o  >> mk.stdout 2>> tmp.stderr
++  g++ $ENV_GCC_OPTS -c -O2 -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 -DUCHIMES=1 $CPPName.cpp -o $CPPName.o  >> mk.stdout 2>> tmp.stderr
+ 	cat tmp.stderr
+ 	cat tmp.stderr >> mk.stderr
+ 	rm -f tmp.stderr

Modified: trunk/packages/mothur/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/makefile.patch	2011-11-10 07:19:10 UTC (rev 8509)
+++ trunk/packages/mothur/trunk/debian/patches/makefile.patch	2011-11-10 08:14:05 UTC (rev 8510)
@@ -1,7 +1,7 @@
 Author: Steffen Moeller <moeller at debian.org>
 Purpose: Comment MAC specific option
---- mothur-1.21.1.orig/makefile
-+++ mothur-1.21.1/makefile
+--- mothur-1.22.2.orig/makefile
++++ mothur-1.22.2/makefile
 @@ -26,7 +26,7 @@
  	#CXX = g++44
  	

Modified: trunk/packages/mothur/trunk/debian/patches/no_lcurses.patch
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/no_lcurses.patch	2011-11-10 07:19:10 UTC (rev 8509)
+++ trunk/packages/mothur/trunk/debian/patches/no_lcurses.patch	2011-11-10 08:14:05 UTC (rev 8510)
@@ -1,9 +1,9 @@
 Author: Andreas Tille <tille at debian.org>
 Date: 2011-01-30
 Dscription: There is no need to link against lncurses because its symbols are not used
---- mothur-1.18.1.orig/makefile
-+++ mothur-1.18.1/makefile
-@@ -54,8 +54,7 @@
+--- mothur-1.22.2.orig/makefile
++++ mothur-1.22.2/makefile
+@@ -59,8 +59,7 @@
  ifeq  ($(strip $(USEREADLINE)),yes)
      CXXFLAGS += -DUSE_READLINE
      LIBS = \

Modified: trunk/packages/mothur/trunk/debian/patches/series
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/series	2011-11-10 07:19:10 UTC (rev 8509)
+++ trunk/packages/mothur/trunk/debian/patches/series	2011-11-10 08:14:05 UTC (rev 8510)
@@ -1,2 +1,3 @@
 makefile.patch
 no_lcurses.patch
+drop_sse_option.patch