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

[Andreas Tille]

Author: tille
Date: 2011-04-26 18:41:17 +0000 (Tue, 26 Apr 2011)
New Revision: 6650

Modified:
   trunk/packages/mothur/trunk/debian/changelog
   trunk/packages/mothur/trunk/debian/control
   trunk/packages/mothur/trunk/debian/patches/makefile.patch
   trunk/packages/mothur/trunk/debian/patches/no_lcurses.patch
   trunk/packages/mothur/trunk/debian/rules
Log:
New upstream version


Modified: trunk/packages/mothur/trunk/debian/changelog
===================================================================
--- trunk/packages/mothur/trunk/debian/changelog	2011-04-26 18:37:57 UTC (rev 6649)
+++ trunk/packages/mothur/trunk/debian/changelog	2011-04-26 18:41:17 UTC (rev 6650)
@@ -1,3 +1,15 @@
+mothur (1.18.1-1) unstable; urgency=low
+
+  * New upstream version (adapted patches to new location of
+    makefile)
+  * debian/rules: No need to specify SOURCEDIR any more
+  * Added Tim Booth <tbooth at ceh.ac.uk> as Uploader,
+    removed Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>
+    from uploaders
+  * Standards-Version: 3.9.2 (no changes needed)
+
+ -- Andreas Tille <tille at debian.org>  Tue, 26 Apr 2011 19:58:45 +0200
+
 mothur (1.18.0-1ubuntu1) lucid; urgency=low
 
   * Rebuild for PPA

Modified: trunk/packages/mothur/trunk/debian/control
===================================================================
--- trunk/packages/mothur/trunk/debian/control	2011-04-26 18:37:57 UTC (rev 6649)
+++ trunk/packages/mothur/trunk/debian/control	2011-04-26 18:41:17 UTC (rev 6650)
@@ -2,11 +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>,
- Andreas Tille <tille at debian.org>
+Uploaders: Steffen Moeller <moeller at debian.org>,
+ Andreas Tille <tille at debian.org>,
+ Tim Booth <tbooth at ceh.ac.uk>
 Build-Depends: debhelper (>= 7.1), libreadline-dev, quilt (>= 0.47)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 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/

Modified: trunk/packages/mothur/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/makefile.patch	2011-04-26 18:37:57 UTC (rev 6649)
+++ trunk/packages/mothur/trunk/debian/patches/makefile.patch	2011-04-26 18:41:17 UTC (rev 6650)
@@ -1,7 +1,7 @@
 Author: Steffen Moeller <moeller at debian.org>
 Purpose: Comment MAC specific option
---- a/Mothur.source/makefile
-+++ b/Mothur.source/makefile
+--- mothur-1.18.1.orig/makefile
++++ mothur-1.18.1/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-04-26 18:37:57 UTC (rev 6649)
+++ trunk/packages/mothur/trunk/debian/patches/no_lcurses.patch	2011-04-26 18:41:17 UTC (rev 6650)
@@ -1,8 +1,8 @@
 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
---- a/Mothur.source/makefile
-+++ b/Mothur.source/makefile
+--- mothur-1.18.1.orig/makefile
++++ mothur-1.18.1/makefile
 @@ -54,8 +54,7 @@
  ifeq  ($(strip $(USEREADLINE)),yes)
      CXXFLAGS += -DUSE_READLINE

Modified: trunk/packages/mothur/trunk/debian/rules
===================================================================
--- trunk/packages/mothur/trunk/debian/rules	2011-04-26 18:37:57 UTC (rev 6649)
+++ trunk/packages/mothur/trunk/debian/rules	2011-04-26 18:41:17 UTC (rev 6650)
@@ -6,10 +6,9 @@
 #export DH_VERBOSE=1
 
 ARCHBITS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
-SOURCEDIR=Mothur.source
 
 %:
-	dh $@ --with quilt --sourcedir=$(SOURCEDIR)
+	dh $@ --with quilt
 
 override_dh_auto_build:
 	if [ $(ARCHBITS) -eq 64 ] ; then \
@@ -25,5 +24,4 @@
 	. debian/get-orig-source
 
 override_dh_auto_clean:
-	rm $(SOURCEDIR)/mothur $(SOURCEDIR)/*.o || true
-
+	rm -f mothur *.o