[med-svn] [bowtie] 03/04: Fix broken patch

Andreas Tille tille at debian.org
Mon Sep 4 12:26:35 UTC 2017


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

tille pushed a commit to branch master
in repository bowtie.

commit 63364cd1bf906b46cdc646e8c29b515afee5f56c
Author: Andreas Tille <tille at debian.org>
Date:   Mon Sep 4 14:16:53 2017 +0200

    Fix broken patch
---
 debian/patches/seqan-rename-fill-to-resize.patch | 34 ------------------------
 1 file changed, 34 deletions(-)

diff --git a/debian/patches/seqan-rename-fill-to-resize.patch b/debian/patches/seqan-rename-fill-to-resize.patch
index 4cc7f17..e4da969 100644
--- a/debian/patches/seqan-rename-fill-to-resize.patch
+++ b/debian/patches/seqan-rename-fill-to-resize.patch
@@ -83,37 +83,3 @@ Last-Update: 2014-08-13
  				assert_gt(_dcV, 3);
  				assert_eq(getValue(zLo, 0), 0);
  				calcZ(t, lo, zLo, this->verbose(), this->sanityCheck());
---- a/blockwise_sa.h.rej
-+++ /dev/null
-@@ -1,31 +0,0 @@
----- blockwise_sa.h
--+++ blockwise_sa.h
--@@ -456,8 +456,8 @@ void KarkkainenBlockwiseSA<TStr>::buildS
-- 		try {
-- 			// Allocate and initialize containers for holding bucket
-- 			// sizes and representatives.
---			fill(bucketSzs, numBuckets, 0, Exact());
---			fill(bucketReps, numBuckets, OFF_MASK, Exact());
--+			resize(bucketSzs, numBuckets, 0, Exact());
--+			resize(bucketReps, numBuckets, OFF_MASK, Exact());
-- 		} catch(bad_alloc &e) {
-- 			if(this->_passMemExc) {
-- 				throw e; // rethrow immediately
--@@ -816,7 +816,7 @@ void KarkkainenBlockwiseSA<TStr>::nextBl
-- 				// Not the last bucket
-- 				assert_lt(_cur, length(_sampleSuffs));
-- 				hi = _sampleSuffs[_cur];
---				fill(zHi, _dcV, 0, Exact());
--+				resize(zHi, _dcV, 0, Exact());
-- 				assert_eq(zHi[0], 0);
-- 				calcZ(t, hi, zHi, this->verbose(), this->sanityCheck());
-- 			}
--@@ -825,7 +825,7 @@ void KarkkainenBlockwiseSA<TStr>::nextBl
-- 				assert_gt(_cur, 0);
-- 				assert_leq(_cur, length(_sampleSuffs));
-- 				lo = _sampleSuffs[_cur-1];
---				fill(zLo, _dcV, 0, Exact());
--+				resize(zLo, _dcV, 0, Exact());
-- 				assert_gt(_dcV, 3);
-- 				assert_eq(zLo[0], 0);
-- 				calcZ(t, lo, zLo, this->verbose(), this->sanityCheck());

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



More information about the debian-med-commit mailing list