[med-svn] [kmer-tools] 02/02: Use existing Debian package for kazlib

[Afif Elghraoui]

This is an automated email from the git hooks/post-receive script.

afif-guest pushed a commit to branch master
in repository kmer-tools.

commit 1df5554f4c407e1de8405b0bcdf7abe921c8de2e
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Sat May 9 02:45:51 2015 -0700

    Use existing Debian package for kazlib
    
    kazlib is included as a convenience copy.
    The build system is patched here to use
    the external kazlib and get-orig-source
    is now set to delete the bundled version.
---
 debian/get-orig-source      |  6 +++---
 debian/patches/kazlib.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/debian/get-orig-source b/debian/get-orig-source
index f04e5a9..e49bf10 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -24,10 +24,10 @@ cd ../tarballs
 # svn export conserves time stamps of the files, checkout does not
 svn export -r ${revision} ${SVNURI} ${TARDIR} >/dev/null 2>/dev/null
 
-# Uncomment to use this ad hoc remove-files section
-#cd ${TARDIR}
+cd ${TARDIR}
 #rm -f *.pdf *.ppt
-#cd ..
+rm -rf libutil/kazlib
+cd ..
 
 tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.xz "${TARDIR}"
 rm -rf "${NAME}"-"$VERSION"
diff --git a/debian/patches/kazlib.patch b/debian/patches/kazlib.patch
new file mode 100644
index 0000000..6ca94a0
--- /dev/null
+++ b/debian/patches/kazlib.patch
@@ -0,0 +1,34 @@
+--- kmer-tools.orig/libutil/Make.include
++++ kmer-tools/libutil/Make.include
+@@ -1,7 +1,6 @@
+ # -*- makefile -*-
+ 
+ $(eval $(call Include,$/mt19937ar/))
+-$(eval $(call Include,$/kazlib/))
+ 
+ src    := $/bigQueue.C \
+           $/bigQueue.H \
+@@ -54,9 +53,4 @@
+ $/.CLEAN := $/*.o
+ 
+ $/libutil.a: ${$/.C_SRCS:.c=.o} ${$/.CXX_SRCS:.C=.o} \
+-	$/mt19937ar/mt19937ar.o \
+-        $/kazlib/dict.o \
+-        $/kazlib/except.o \
+-        $/kazlib/hash.o \
+-        $/kazlib/list.o \
+-        $/kazlib/sfx.o
++	$/mt19937ar/mt19937ar.o
+--- kmer-tools.orig/configure.sh
++++ kmer-tools/configure.sh
+@@ -369,8 +369,8 @@
+ CXXLD             := \${CXX}
+ CCDEP		  := gcc -MM -MG
+ CXXDEP	          := g++ -MM -MG
+-CLIBS             += -lm -lbz2
+-CXXLIBS           += -lm -lbz2
++CLIBS             += -lm -lbz2 -lkaz
++CXXLIBS           += -lm -lbz2 -lkaz
+ PYTHON            := $PYTHON
+ PYTHON_H          := $CFLAGS_PYTHON/Python.h
+ CFLAGS_PYTHON     := -I$CFLAGS_PYTHON
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7e2ebf2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kazlib.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/kmer-tools.git