[med-svn] r2772 - in trunk/packages/velvet/trunk/debian: . patches

[tille at alioth.debian.org]

Author: tille
Date: 2008-12-11 13:37:27 +0000 (Thu, 11 Dec 2008)
New Revision: 2772

Added:
   trunk/packages/velvet/trunk/debian/patches/
   trunk/packages/velvet/trunk/debian/patches/10_use_internal_zlib.patch
   trunk/packages/velvet/trunk/debian/patches/series
Modified:
   trunk/packages/velvet/trunk/debian/rules
Log:
Do not touch third-party/zlib-1.2.3 at all.  The patch for src/readSet.c might be a little bit rude and perhaps we should suggest a better #ifdef EXTERNAL_ZLIB magic to upstream instead of this.


Added: trunk/packages/velvet/trunk/debian/patches/10_use_internal_zlib.patch
===================================================================
--- trunk/packages/velvet/trunk/debian/patches/10_use_internal_zlib.patch	                        (rev 0)
+++ trunk/packages/velvet/trunk/debian/patches/10_use_internal_zlib.patch	2008-12-11 13:37:27 UTC (rev 2772)
@@ -0,0 +1,50 @@
+--- velvet_0.7.20.orig/Makefile
++++ velvet_0.7.20/Makefile
+@@ -5,12 +5,12 @@
+ OPT = -O3
+ DEF = 
+ 
+-Z_LIB_DIR=third-party/zlib-1.2.3
+-Z_LIB_FILES=$(Z_LIB_DIR)/*.o
++# Z_LIB_DIR=third-party/zlib-1.2.3
++# Z_LIB_FILES=$(Z_LIB_DIR)/*.o
+ 
+ # Mac OS users: uncomment the following lines
+-# Z_LIB_FILES=
+-# LDFLAGS = -lm -lz
++Z_LIB_FILES=
++LDFLAGS = -lm -lz
+ # CFLAGS = -Wall -m64
+ 
+ # Sparc/Solaris users: uncomment the following line
+@@ -23,13 +23,13 @@
+ 
+ clean :
+ 	-rm obj/*.o obj/dbg/*.o ./velvet* 
+-	cd $(Z_LIB_DIR) && make clean
++	# cd $(Z_LIB_DIR) && make clean
+ 
+ cleanobj: 
+ 	-rm obj/*.o obj/dbg/*.o 
+ 
+ zlib : 
+-	cd $(Z_LIB_DIR); ./configure; make; rm minigzip.o; rm example.o
++	# cd $(Z_LIB_DIR); ./configure; make; rm minigzip.o; rm example.o
+ 
+ velveth : $(OBJ) 
+ 	$(CC) $(CFLAGS) $(OPT) $(LDFLAGS) -o velveth obj/tightString.o obj/run.o obj/recycleBin.o obj/splay.o obj/splayTable.o obj/readSet.o obj/crc.o $(Z_LIB_FILES)
+--- 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()
+ {

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-11 13:37:27 UTC (rev 2772)
@@ -0,0 +1 @@
+10_use_internal_zlib.patch

Modified: trunk/packages/velvet/trunk/debian/rules
===================================================================
--- trunk/packages/velvet/trunk/debian/rules	2008-12-11 10:41:34 UTC (rev 2771)
+++ trunk/packages/velvet/trunk/debian/rules	2008-12-11 13:37:27 UTC (rev 2772)
@@ -2,6 +2,7 @@
 
 DEB_COMPRESS_EXCLUDE := .pdf	# The PDF doc will not be compressed
 
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk