[med-svn] [libseqlib] 02/02: Move the feature to fermi-lite which is way more clean - hope it gets accepted upstream

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libseqlib.

commit a089463c7a8a304e11c0d974893e66a1dd697c3a
Author: Andreas Tille <tille at debian.org>
Date:   Fri Feb 3 11:20:04 2017 +0100

    Move the feature to fermi-lite which is way more clean - hope it gets accepted upstream
---
 debian/patches/fermi-lite_additional.h.patch | 36 ----------------------------
 debian/patches/series                        |  1 -
 2 files changed, 37 deletions(-)

diff --git a/debian/patches/fermi-lite_additional.h.patch b/debian/patches/fermi-lite_additional.h.patch
deleted file mode 100644
index 114a599..0000000
--- a/debian/patches/fermi-lite_additional.h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Fri, 27 Jan 2017 13:18:48 +0100
-Description: Upstream has put this into fermi-lite fork but as long this
- is not accepted upstream we keep this here
-
---- /dev/null
-+++ b/src/fml_additional.h
-@@ -0,0 +1,18 @@
-+#ifndef AC_FML_ADDITIONAL_H__
-+#define AC_FML_ADDITIONAL_H__
-+
-+#include <fml/bfc.h>
-+
-+void kmer_correct(ec_step_t * es, int mode, bfc_ch_t * ch) {
-+  int i = 0;
-+  es->e = (bfc_ec1buf_t**)calloc(es->opt->n_threads, sizeof(void*)); //jwala added cast
-+  for (i = 0; i < es->opt->n_threads; ++i)
-+    es->e[i] = ec1buf_init(es->opt, ch), es->e[i]->mode = mode;
-+  kt_for(es->opt->n_threads, worker_ec, es, es->n_seqs);
-+  for (i = 0; i < es->opt->n_threads; ++i)
-+    ec1buf_destroy(es->e[i]);
-+  free(es->e);
-+}
-+
-+#endif
-+
---- a/src/BFC.cpp
-+++ b/src/BFC.cpp
-@@ -32,6 +32,7 @@ SOFTWARE.
- 
- #include "SeqLib/BFC.h"
- #include <fml/bfc.h>
-+#include "fml_additional.h"
- 
- #include <stdexcept>
- #include <algorithm>
diff --git a/debian/patches/series b/debian/patches/series
index 135d02c..5081794 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ use_debian_packaged_libs.patch
 adapt_to_debian_fermi-lite.patch
 fix_fermi-lite_usage.patch
 fix_htslib_usage.patch
-fermi-lite_additional.h.patch
 fml_include_path.patch

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