Author: tbooth-guest Date: 2011-04-14 16:38:14 +0000 (Thu, 14 Apr 2011) New Revision: 6556
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/rules Log: Mothur 1.18 changes the layout of the upstream zipfile. Have modified the package to handle this and re-done patches. Modified: trunk/packages/mothur/trunk/debian/changelog =================================================================== --- trunk/packages/mothur/trunk/debian/changelog 2011-04-14 11:47:13 UTC (rev 6555) +++ trunk/packages/mothur/trunk/debian/changelog 2011-04-14 16:38:14 UTC (rev 6556) @@ -1,3 +1,11 @@ +mothur (1.18.0-1ubuntu1) lucid; urgency=low + + * Rebuild for PPA + * Source now comes in subdirectory Mothur.source - modify rules file + to handle this + + -- Tim Booth <[email protected]> Thu, 14 Apr 2011 14:50:24 +0100 + mothur (1.17.3-1) unstable; urgency=low * New upstream version, which specifically solves some copyright Modified: trunk/packages/mothur/trunk/debian/patches/makefile.patch =================================================================== --- trunk/packages/mothur/trunk/debian/patches/makefile.patch 2011-04-14 11:47:13 UTC (rev 6555) +++ trunk/packages/mothur/trunk/debian/patches/makefile.patch 2011-04-14 16:38:14 UTC (rev 6556) @@ -1,8 +1,8 @@ Author: Steffen Moeller <[email protected]> Purpose: Comment MAC specific option ---- mothur-1.14.0.orig/makefile -+++ mothur-1.14.0/makefile -@@ -20,7 +20,7 @@ +--- a/Mothur.source/makefile ++++ b/Mothur.source/makefile +@@ -26,7 +26,7 @@ #CXX = g++44 #if you are a mac user use the following line Modified: trunk/packages/mothur/trunk/debian/patches/no_lcurses.patch =================================================================== --- trunk/packages/mothur/trunk/debian/patches/no_lcurses.patch 2011-04-14 11:47:13 UTC (rev 6555) +++ trunk/packages/mothur/trunk/debian/patches/no_lcurses.patch 2011-04-14 16:38:14 UTC (rev 6556) @@ -1,8 +1,8 @@ Author: Andreas Tille <[email protected]> Date: 2011-01-30 Dscription: There is no need to link against lncurses because its symbols are not used ---- mothur-1.17.3.orig/makefile -+++ mothur-1.17.3/makefile +--- a/Mothur.source/makefile ++++ b/Mothur.source/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-14 11:47:13 UTC (rev 6555) +++ trunk/packages/mothur/trunk/debian/rules 2011-04-14 16:38:14 UTC (rev 6556) @@ -6,15 +6,16 @@ #export DH_VERBOSE=1 ARCHBITS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS) +SOURCEDIR=Mothur.source %: - dh $@ --with quilt + dh $@ --with quilt --sourcedir=$(SOURCEDIR) override_dh_auto_build: if [ $(ARCHBITS) -eq 64 ] ; then \ - $(MAKE) 64BIT_VERSION=yes ; \ + dh_auto_build 64BIT_VERSION=yes ; \ else \ - $(MAKE) ; \ + dh_auto_build ; \ fi override_dh_auto_install: @@ -24,5 +25,5 @@ . debian/get-orig-source override_dh_auto_clean: - rm mothur *.o || true + rm $(SOURCEDIR)/mothur $(SOURCEDIR)/*.o || true _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
