[med-svn] [Git][med-team/sniffles][master] 3 commits: Upstream accepted patch. New version.

[Steffen Möller]

Steffen Möller pushed to branch master at Debian Med / sniffles


Commits:
40d369f7 by Steffen Moeller at 2020-11-27T23:36:28+01:00
Upstream accepted patch. New version.

- - - - -
8ac1729c by Steffen Moeller at 2020-11-27T23:37:39+01:00
New upstream version 1.0.12b+ds
- - - - -
62a65df5 by Steffen Moeller at 2020-11-27T23:37:39+01:00
Update upstream source from tag 'upstream/1.0.12b+ds'

Update to upstream version '1.0.12b+ds'
with Debian dir b85b890c43d09df1f2bffb55c5503bdd8e883da0
- - - - -


6 changed files:

- CMakeLists.txt
- debian/changelog
- debian/patches/series
- + debian/patches/stoppingRecursion.patch
- debian/watch
- src/Paramer.h


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -7,9 +7,9 @@ option(STATIC "Build static binary" OFF)
  set( SNIF_VERSION_MINOR 0 )
 IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
     message(STATUS "Building in debug mode!")
-    set( SNIF_VERSION_BUILD 11-debug )
+    set( SNIF_VERSION_BUILD 12-debug )
 else()
-	set( SNIF_VERSION_BUILD 11 )
+	set( SNIF_VERSION_BUILD 12 )
 ENDIF()
 
 


=====================================
debian/changelog
=====================================
@@ -1,8 +1,8 @@
-sniffles (1.0.12+ds-1) UNRELEASED; urgency=medium
+sniffles (1.0.12b+ds-1) unstable; urgency=medium
 
   * Team upload.
   * New upstream version
-  * TODO/BLOCKER: Wait for reaction of upstream to https://github.com/fritzsedlazeck/Sniffles/pull/225
+  * Fixed d/watch to also accept a-z updates
 
  -- Steffen Moeller <moeller at debian.org>  Wed, 02 Sep 2020 20:48:13 +0200
 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 external-libs.patch
 no-extra-binary.patch
+stoppingRecursion.patch


=====================================
debian/patches/stoppingRecursion.patch
=====================================
@@ -0,0 +1,19 @@
+Author: Steffen Moeller <moeller at debian.org>
+Description: Fixing recursion - accepted upstream
+Forward: https://github.com/fritzsedlazeck/Sniffles/pull/225
+Index: sniffles/src/tree/Intervall_bed.cpp
+===================================================================
+--- sniffles.orig/src/tree/Intervall_bed.cpp
++++ sniffles/src/tree/Intervall_bed.cpp
+@@ -80,9 +80,9 @@ bool IntervallTree_bed::is_in(long posit
+ 	} else {
+ 		long score = p->overlap(position);
+ 		if (score > 0) {
+-			is_in(position, p->left);
++			return(is_in(position, p->left));
+ 		} else if (score < 0) {
+-			is_in(position, p->right);
++			return(is_in(position, p->right));
+ 		} else {
+ 			return true;
+ 		}


=====================================
debian/watch
=====================================
@@ -1,5 +1,4 @@
 version=4
 
-opts="repack,repacksuffix=+ds,dversionmangle=s/\+ds\d*$//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%sniffles-$1.tar.gz%" \
-   https://github.com/fritzsedlazeck/sniffles/tags \
-   (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
+opts="repack,repacksuffix=+ds,dversionmangle=auto,filenamemangle=s%(?:.*?)?v(\d[\d.]*[a-z]?)\.tar\.gz%sniffles-$1.tar.gz%" \
+   https://github.com/fritzsedlazeck/Sniffles/tags (?:.*?/)?v(\d[\d.]*[a-z]?)\.tar\.gz


=====================================
src/Paramer.h
=====================================
@@ -25,7 +25,7 @@ class Parameter {
 private:
 	Parameter() {
 		window_thresh=10;//TODO check!
-		version="1.0.11";
+		version="1.0.12";
 		huge_ins = 999;//TODO check??
 	}
 	~Parameter() {



View it on GitLab: https://salsa.debian.org/med-team/sniffles/-/compare/2e3595cf6e0bdc972fb214bb16612243ba1a36cc...62a65df58966f762cc740fc36d47f5ec0b98a3b6

-- 
View it on GitLab: https://salsa.debian.org/med-team/sniffles/-/compare/2e3595cf6e0bdc972fb214bb16612243ba1a36cc...62a65df58966f762cc740fc36d47f5ec0b98a3b6
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/20201127/753d684e/attachment-0001.html>