Author: tille Date: 2008-12-15 21:12:04 +0000 (Mon, 15 Dec 2008) New Revision: 2798
Added: trunk/packages/velvet/trunk/debian/patches/ trunk/packages/velvet/trunk/debian/patches/20_external_zlib.patch trunk/packages/velvet/trunk/debian/patches/series Modified: trunk/packages/velvet/trunk/debian/control trunk/packages/velvet/trunk/debian/rules Log: Do not use third-party/zlib stuff. Patch should be suggested upstream. Remark: The #ifdef (Windows) condition does not work because the inclulde path mentioned there does not exist. Modified: trunk/packages/velvet/trunk/debian/control =================================================================== --- trunk/packages/velvet/trunk/debian/control 2008-12-15 20:51:41 UTC (rev 2797) +++ trunk/packages/velvet/trunk/debian/control 2008-12-15 21:12:04 UTC (rev 2798) @@ -5,7 +5,7 @@ DM-Upload-Allowed: yes Uploaders: Charles Plessy <[email protected]>, Andreas Tille <[email protected]> -Build-Depends: cdbs, debhelper (>= 7), zlib1g-dev +Build-Depends: cdbs, debhelper (>= 7), zlib1g-dev, quilt Standards-Version: 3.8.0 Homepage: http://www.ebi.ac.uk/~zerbino/velvet/ Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/velvet/trunk/?rev=0&sc=0 Added: trunk/packages/velvet/trunk/debian/patches/20_external_zlib.patch =================================================================== --- trunk/packages/velvet/trunk/debian/patches/20_external_zlib.patch (rev 0) +++ trunk/packages/velvet/trunk/debian/patches/20_external_zlib.patch 2008-12-15 21:12:04 UTC (rev 2798) @@ -0,0 +1,35 @@ +--- velvet_0.7.20.orig/src/readSet.c ++++ velvet_0.7.20/src/readSet.c +@@ -28,11 +28,7 @@ + #include "tightString.h" + #include "readSet.h" + +-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) +-#include "../third-party/zlib-1.2.3/Win32/include/zlib.h" +-#else +-#include "../third-party/zlib-1.2.3/zlib.h" +-#endif ++#include "zlib.h" + + ReadSet *newReadSet() + { +--- velvet_0.7.20.orig/Makefile ++++ velvet_0.7.20/Makefile +@@ -7,6 +7,7 @@ + + Z_LIB_DIR=third-party/zlib-1.2.3 + Z_LIB_FILES=$(Z_LIB_DIR)/*.o ++Z_LIB_INC=$(ZLIB_DIR) + + # Mac OS users: uncomment the following lines + # Z_LIB_FILES= +@@ -59,7 +60,7 @@ + mkdir -p obj/dbg + + obj/%.o: src/%.c +- $(CC) $(CFLAGS) $(OPT) $(DEF) -c $? -o $@ ++ $(CC) $(CFLAGS) $(OPT) -I$(Z_LIB_INC) $(DEF) -c $? -o $@ + + obj/dbg/%.o: src/%.c +- $(CC) $(CFLAGS) $(DEBUG) $(DEF) -c $? -o $@ ++ $(CC) $(CFLAGS) $(DEBUG) -I$(Z_LIB_INC) $(DEF) -c $? -o $@ Added: trunk/packages/velvet/trunk/debian/patches/series =================================================================== --- trunk/packages/velvet/trunk/debian/patches/series (rev 0) +++ trunk/packages/velvet/trunk/debian/patches/series 2008-12-15 21:12:04 UTC (rev 2798) @@ -0,0 +1 @@ +20_external_zlib.patch Modified: trunk/packages/velvet/trunk/debian/rules =================================================================== --- trunk/packages/velvet/trunk/debian/rules 2008-12-15 20:51:41 UTC (rev 2797) +++ trunk/packages/velvet/trunk/debian/rules 2008-12-15 21:12:04 UTC (rev 2798) @@ -5,4 +5,4 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk -DEB_MAKE_BUILD_TARGET = obj velveth velvetg Z_LIB_FILES='' LDFLAGS='-lm -lz' OPT='' +DEB_MAKE_BUILD_TARGET = obj velveth velvetg Z_LIB_FILES='' LDFLAGS='-lm -lz' OPT='' Z_LIB_INC='/usr/include' _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
