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

[Andreas Tille]

Author: tille
Date: 2011-01-29 23:40:51 +0000 (Sat, 29 Jan 2011)
New Revision: 5795

Removed:
   trunk/packages/mothur/trunk/debian/patches/fix_clean_with_no_object_files.patch
Modified:
   trunk/packages/mothur/trunk/debian/changelog
   trunk/packages/mothur/trunk/debian/control
   trunk/packages/mothur/trunk/debian/patches/makefile.patch
Log:
Make latest version build


Modified: trunk/packages/mothur/trunk/debian/changelog
===================================================================
--- trunk/packages/mothur/trunk/debian/changelog	2011-01-29 23:28:04 UTC (rev 5794)
+++ trunk/packages/mothur/trunk/debian/changelog	2011-01-29 23:40:51 UTC (rev 5795)
@@ -1,17 +1,5 @@
-mothur (1.12.3-1) UNRELEASED; urgency=low
+mothur (1.14.0-1) UNRELEASED; urgency=low
 
-  * New upstream version.
-
- -- Steffen Moeller <moeller at debian.org>  Fri, 06 Aug 2010 14:02:45 +0200
-
-mothur (1.12.2-1) UNRELEASED; urgency=low
-
-  * New upstream version.
-
- -- Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>  Thu, 05 Aug 2010 13:54:18 +0200
-
-mothur (1.11.0-1) UNRELEASED; urgency=low
-
   * Initial release (Closes: #589675)
 
- -- Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>  Fri, 02 Jul 2010 12:27:50 +0200
+ -- Andreas Tille <tille at debian.org>  Sun, 30 Jan 2011 00:21:42 +0100

Modified: trunk/packages/mothur/trunk/debian/control
===================================================================
--- trunk/packages/mothur/trunk/debian/control	2011-01-29 23:28:04 UTC (rev 5794)
+++ trunk/packages/mothur/trunk/debian/control	2011-01-29 23:40:51 UTC (rev 5795)
@@ -2,9 +2,11 @@
 Section: science
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>, Steffen Moeller <moeller at debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1.0
+Uploaders: Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>,
+ Steffen Moeller <moeller at debian.org>,
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 7), libreadline-dev
+Standards-Version: 3.9.1
 Homepage: http://www.mothur.org
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mothur/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mothur/trunk/

Deleted: trunk/packages/mothur/trunk/debian/patches/fix_clean_with_no_object_files.patch
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/fix_clean_with_no_object_files.patch	2011-01-29 23:28:04 UTC (rev 5794)
+++ trunk/packages/mothur/trunk/debian/patches/fix_clean_with_no_object_files.patch	2011-01-29 23:40:51 UTC (rev 5795)
@@ -1,13 +0,0 @@
-Index: mothur-1.11.0/makefile
-===================================================================
---- mothur-1.11.0.orig/makefile	2010-07-02 12:54:50.381707626 +0200
-+++ mothur-1.11.0/makefile	2010-07-02 12:56:01.039308482 +0200
-@@ -473,7 +473,7 @@
- 		-o mothur
- 
- clean : 
--		rm \
-+		rm -f \
- 		./sharedutilities.o\
- 		./treegroupscommand.o\
- 		./bootstrapsharedcommand.o\

Modified: trunk/packages/mothur/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/makefile.patch	2011-01-29 23:28:04 UTC (rev 5794)
+++ trunk/packages/mothur/trunk/debian/patches/makefile.patch	2011-01-29 23:40:51 UTC (rev 5795)
@@ -1,13 +1,13 @@
-Index: mothur-1.12.2/makefile
-===================================================================
---- mothur-1.12.2.orig/makefile	2010-08-05 14:03:33.000000000 +0200
-+++ mothur-1.12.2/makefile	2010-08-05 14:04:12.000000000 +0200
-@@ -28,7 +28,7 @@
- 64BIT_VERSION ?= yes
- 
- ifeq  ($(strip $(64BIT_VERSION)),yes)
--    TARGET_ARCH += -arch x86_64
-+    #TARGET_ARCH += -arch x86_64
- 	 CXXFLAGS += -DBIT_VERSION
+Author: Steffen Moeller <moeller at debian.org>
+Purpose: Comment MAC specific option
+--- mothur-1.14.0.orig/makefile
++++ mothur-1.14.0/makefile
+@@ -20,7 +20,7 @@
+ 	#CXX = g++44
  	
- 	#if you are using centos uncomment the following lines
+ 	#if you are a mac user use the following line
+-	TARGET_ARCH += -arch x86_64
++	#TARGET_ARCH += -arch x86_64
+ 	
+ 	#if you are a linux user use the following line
+ 	#CXXFLAGS += -mtune=native -march=native -m64