[med-svn] [Git][med-team/adapterremoval][master] 4 commits: Fix build on some architectures

Andreas Tille gitlab at salsa.debian.org
Fri Jan 10 15:00:21 GMT 2020



Andreas Tille pushed to branch master at Debian Med / adapterremoval


Commits:
35b394eb by Andreas Tille at 2020-01-10T15:42:54+01:00
Fix build on some architectures

- - - - -
6c2d8de0 by Andreas Tille at 2020-01-10T15:43:40+01:00
Set upstream metadata fields: Bug-Submit.
- - - - -
f9ec325b by Andreas Tille at 2020-01-10T15:54:34+01:00
Complete patch

- - - - -
039cf0dc by Andreas Tille at 2020-01-10T15:58:55+01:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/fix_conversion.patch
- debian/patches/series
- debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+adapterremoval (2.3.1-3) unstable; urgency=medium
+
+  * Fix build on some architectures
+    Closes: #923772
+  * Set upstream metadata fields: Bug-Submit.
+
+ -- Andreas Tille <tille at debian.org>  Fri, 10 Jan 2020 15:43:41 +0100
+
 adapterremoval (2.3.1-2) unstable; urgency=medium
 
   * Build-Depends: markdown instead of python-markdown


=====================================
debian/patches/fix_conversion.patch
=====================================
@@ -0,0 +1,45 @@
+Description: Fix build on some architectures
+Bug-Debian: https://bugs.debian.org/923772
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 10 Jan 2020 15:39:08 +0100
+
+--- a/src/alignment_tables.cpp
++++ b/src/alignment_tables.cpp
+@@ -82,7 +82,7 @@ std::vector<phred_scores> calculate_phre
+ #endif
+ 
+ 
+-const char IDENTICAL_NTS[PHRED_TABLE_SIZE] = {
++const signed char IDENTICAL_NTS[PHRED_TABLE_SIZE] = {
+   0x22,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   0x22, 0x22,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   0x22, 0x22, 0x24,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+@@ -179,7 +179,7 @@ const char IDENTICAL_NTS[PHRED_TABLE_SIZ
+   0x7d, 0x7d, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e,
+ };
+ 
+-const char DIFFERENT_NTS[PHRED_TABLE_SIZE] = {
++const signed char DIFFERENT_NTS[PHRED_TABLE_SIZE] = {
+   0x22,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   0x22, 0x22,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   0x23, 0x23, 0x22,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+--- a/src/alignment_tables.hpp
++++ b/src/alignment_tables.hpp
+@@ -37,7 +37,7 @@ const size_t PHRED_TABLE_SIZE = 8836;
+  * Position is calculated as phred_1 * (MAX_PHRED_SCORE + 1) + phred_2,
+  * assuming that phred_1 >= phred_2.
+  */
+-extern const char IDENTICAL_NTS[PHRED_TABLE_SIZE];
++extern const signed char IDENTICAL_NTS[PHRED_TABLE_SIZE];
+ 
+ /**
+  * Table of Phred scores to assigned for mismatching positions during collapsing.
+@@ -45,7 +45,7 @@ extern const char IDENTICAL_NTS[PHRED_TA
+  * Position is calculated as phred_1 * (MAX_PHRED_SCORE + 1) + phred_2,
+  * assuming that phred_1 >= phred_2.
+  */
+-extern const char DIFFERENT_NTS[PHRED_TABLE_SIZE];
++extern const signed char DIFFERENT_NTS[PHRED_TABLE_SIZE];
+ 
+ 
+ } // namespace ar


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ adapt-benchmarking.patch
 reduce_benchmark_length.patch
 delete_adapterremoval1x_completely.patch
 2to3.patch
+fix_conversion.patch


=====================================
debian/upstream/metadata
=====================================
@@ -23,3 +23,4 @@ Registry:
 Bug-Database: https://github.com/MikkelSchubert/adapterremoval/issues
 Repository: https://github.com/MikkelSchubert/adapterremoval.git
 Repository-Browse: https://github.com/MikkelSchubert/adapterremoval
+Bug-Submit: https://github.com/MikkelSchubert/adapterremoval/issues/new



View it on GitLab: https://salsa.debian.org/med-team/adapterremoval/compare/bb4d0b2f8d10602a43ffe9dfb2d21dcbfcb5b525...039cf0dca33ed375589dfa45ccb1f4fe0827511e

-- 
View it on GitLab: https://salsa.debian.org/med-team/adapterremoval/compare/bb4d0b2f8d10602a43ffe9dfb2d21dcbfcb5b525...039cf0dca33ed375589dfa45ccb1f4fe0827511e
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/20200110/e51c3b1d/attachment-0001.html>


More information about the debian-med-commit mailing list