[med-svn] [kmer-tools] 09/13: Drop quilt patches

[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 33b46e1e1e0c3bc151f1c0d89311948e8e2105d6
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Fri Jan 1 22:23:02 2016 -0800

    Drop quilt patches
---
 debian/patches/kazlib.patch        | 41 --------------------------------------
 debian/patches/remove-kazlib.patch | 39 ------------------------------------
 debian/patches/series              |  2 --
 3 files changed, 82 deletions(-)

diff --git a/debian/patches/kazlib.patch b/debian/patches/kazlib.patch
deleted file mode 100644
index fe75ca8..0000000
--- a/debian/patches/kazlib.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Link external kazlib and do not build the bundled copy.
- Upstream bundles a convenience copy of kazlib, but this is already
- available in Debian. This patch removes the kazlib sources from the
- package's Makefile and adds a library flag to link to an externally
- installed copy.
-Author: Afif Elghraoui <afif at ghraoui.name>
-Last-Update: 2015-05-25
---- 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             := \${CC} -MM -MG
- CXXDEP	          := \${CXX} -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/remove-kazlib.patch b/debian/patches/remove-kazlib.patch
deleted file mode 100644
index cce513d..0000000
--- a/debian/patches/remove-kazlib.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Remove kazlib entirely
- Upstream has reported [1] that kazlib is only used by one
- component of this source distribution and that he intends
- to deprecate it. As early versions of this package do not
- include the component requiring kazlib, this patch prevents
- the building of libutil/bigQueue, the main source file that
- uses kazlib. For the source to build at this point, the
- components that rely on bigQueue must be excluded from the
- build.
- .
- 1. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784863#20
-Author: Afif Elghraoui <afif at ghraoui.name>
-Last-Update: 2015-05-25
---- kmer-tools.orig/configure.sh
-+++ kmer-tools/configure.sh
-@@ -369,8 +369,8 @@
- CXXLD             := \${CXX}
- CCDEP             := \${CC} -MM -MG
- CXXDEP	          := \${CXX} -MM -MG
--CLIBS             += -lm -lbz2 -lkaz
--CXXLIBS           += -lm -lbz2 -lkaz
-+CLIBS             += -lm -lbz2
-+CXXLIBS           += -lm -lbz2
- PYTHON            := $PYTHON
- PYTHON_H          := $CFLAGS_PYTHON/Python.h
- CFLAGS_PYTHON     := -I$CFLAGS_PYTHON
---- kmer-tools.orig/libutil/Make.include
-+++ kmer-tools/libutil/Make.include
-@@ -2,9 +2,7 @@
- 
- $(eval $(call Include,$/mt19937ar/))
- 
--src    := $/bigQueue.C \
--          $/bigQueue.H \
--          $/bitOperations.h \
-+src    := $/bitOperations.h \
-           $/bitPackedArray.C \
-           $/bitPackedArray.H \
-           $/bitPackedFile.C \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4fad957..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-kazlib.patch
-remove-kazlib.patch

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