[med-svn] [Git][med-team/mash][master] 3 commits: new upstream release

[Sascha Steinbiss]

Sascha Steinbiss pushed to branch master at Debian Med / mash


Commits:
a38bf3a3 by Sascha Steinbiss at 2019-10-23T16:39:39Z
new upstream release

- - - - -
c24e551d by Sascha Steinbiss at 2019-10-23T16:39:49Z
New upstream version 2.2.2+dfsg
- - - - -
d16740f3 by Sascha Steinbiss at 2019-10-23T16:40:15Z
Merge tag 'upstream/2.2.2+dfsg'

Upstream version 2.2.2+dfsg

- - - - -


3 changed files:

- debian/changelog
- src/mash/Sketch.cpp
- src/mash/version.h


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+mash (2.2.2+dfsg-1) unstable; urgency=medium
+
+  [ Steffen Moeller ]
+  * Added ref to Conda.
+
+  [ Sascha Steinbiss ]
+  * New upstream release.
+
+ -- Sascha Steinbiss <satta at debian.org>  Wed, 23 Oct 2019 18:38:19 +0200
+
 mash (2.2.1+dfsg-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
src/mash/Sketch.cpp
=====================================
@@ -534,17 +534,19 @@ void addMinHashes(MinHashHeap & minHashHeap, char * seq, uint64_t length, const
         reverseComplement(seq, seqRev, length);
     }
     
+    uint64_t j = 0;
+    
     for ( uint64_t i = 0; i < length - kmerSize + 1; i++ )
     {
 		// repeatedly skip kmers with bad characters
 		//
 		bool bad = false;
 		//
-		for ( uint64_t j = i; j < i + kmerSize && i + kmerSize <= length; j++ )
+		for ( ; j < i + kmerSize && i + kmerSize <= length; j++ )
 		{
 			if ( ! parameters.alphabet[seq[j]] )
 			{
-				i = j; // skip to past the bad character
+				i = j++; // skip to past the bad character
 				bad = true;
 				break;
 			}


=====================================
src/mash/version.h
=====================================
@@ -4,4 +4,4 @@
 //
 // See the LICENSE.txt file included with this software for license information.
 
-static const char * version = "2.2";
+static const char * version = "2.2.2";



View it on GitLab: https://salsa.debian.org/med-team/mash/compare/089f06d5e7e08d430a44f08d05f54a2f069105c7...d16740f369bcbaa403a1d89c543b3208a09383d5

-- 
View it on GitLab: https://salsa.debian.org/med-team/mash/compare/089f06d5e7e08d430a44f08d05f54a2f069105c7...d16740f369bcbaa403a1d89c543b3208a09383d5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191023/3d52770c/attachment-0001.html>