[med-svn] [Git][med-team/libmaus2][master] 3 commits: fix-test-on-32bits.patch forwarded

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / libmaus2


Commits:
131bd698 by Étienne Mollier at 2021-06-28T20:03:04+02:00
fix-test-on-32bits.patch forwarded

- - - - -
5a1936a1 by Étienne Mollier at 2021-06-29T00:28:58+02:00
spelling-error-in-header.patch applied upstream

- - - - -
d25d2050 by Étienne Mollier at 2021-06-29T00:31:49+02:00
ready for upload to experimental

- - - - -


3 changed files:

- debian/changelog
- debian/patches/fix-test-on-32bits.patch
- − debian/patches/spelling-error-in-header.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,12 @@
-libmaus2 (2.0.791+dfsg-1) UNRELEASED; urgency=medium
+libmaus2 (2.0.791+dfsg-1~0exp0) experimental; urgency=medium
 
   * New upstream version
   * Remove trailing whitespace in debian/changelog (routine-update)
   * d/control: updated my uploader address
+  * add fix-test-on-32bits.patch; fix FTBFS on i386
+  * removed spelling-error-in-header.patch; applied upstream
 
- -- Étienne Mollier <emollier at debian.org>  Sun, 27 Jun 2021 09:55:25 +0200
+ -- Étienne Mollier <emollier at debian.org>  Tue, 29 Jun 2021 00:02:08 +0200
 
 libmaus2 (2.0.768+dfsg-2) unstable; urgency=medium
 


=====================================
debian/patches/fix-test-on-32bits.patch
=====================================
@@ -1,6 +1,6 @@
 Description: fix test breaking due to type mismatch on 32 bits platforms
 Author: Étienne Mollier <emollier at debian.org>
-Forwarded: no
+Forwarded: https://gitlab.com/german.tischler/libmaus2/-/issues/35
 Last-Update: 2021-06-27
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/


=====================================
debian/patches/spelling-error-in-header.patch deleted
=====================================
@@ -1,51 +0,0 @@
-Description: fix spelling error in header files
- This is causing lintian reports spelling-error-in-binary in biobambam2.
-Author: Étienne Mollier <etienne.mollier at mailoo.org>
-Forwarded: no
-Last-Update: 2020-11-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- libmaus2.orig/src/libmaus2/bambam/BamHeaderLowMem.hpp
-+++ libmaus2/src/libmaus2/bambam/BamHeaderLowMem.hpp
-@@ -699,7 +699,7 @@
- 						if ( ! isi )
- 						{
- 							::libmaus2::exception::LibMausException se;
--							se.getStream() << "BamHeaderLowMem: defect @PG line with non-existant parent " << std::string(text+parstart,text+parend) << ":\n" << PLA->getLine(text,lineid) << std::endl;
-+							se.getStream() << "BamHeaderLowMem: defect @PG line with non-existent parent " << std::string(text+parstart,text+parend) << ":\n" << PLA->getLine(text,lineid) << std::endl;
- 							se.finish();
- 							throw se;
- 						}
---- libmaus2.orig/src/libmaus2/bambam/HeaderLine.hpp
-+++ libmaus2/src/libmaus2/bambam/HeaderLine.hpp
-@@ -129,7 +129,7 @@
- 				if ( ! hasKey(key) )
- 				{
- 					::libmaus2::exception::LibMausException se;
--					se.getStream() << "bambam::HeaderLine::getValue called for non existant key: " << key << " for line of type " << type << std::endl;
-+					se.getStream() << "bambam::HeaderLine::getValue called for non existent key: " << key << " for line of type " << type << std::endl;
- 					se.finish();
- 					throw se;
- 				}
---- libmaus2.orig/src/libmaus2/fastx/FastABgzfIndex.hpp
-+++ libmaus2/src/libmaus2/fastx/FastABgzfIndex.hpp
-@@ -98,7 +98,7 @@
- 				if ( i < 0 )
- 				{
- 					libmaus2::exception::LibMausException ex;
--					ex.getStream() << "::libmaus2::fastx::FastABgzfIndexEntry::operator[] called for non existant id" << std::endl;
-+					ex.getStream() << "::libmaus2::fastx::FastABgzfIndexEntry::operator[] called for non existent id" << std::endl;
- 					ex.finish();
- 					throw ex;
- 				}
---- libmaus2.orig/src/test/testAIO.cpp
-+++ libmaus2/src/test/testAIO.cpp
-@@ -255,7 +255,7 @@
- 
- void testPosixFdOverwrite()
- {
--	std::string const fn = "nonexistant.test.file";
-+	std::string const fn = "nonexistent.test.file";
- 	std::string const text1 = "Hello world.";
- 	std::string const text2 = "new text";
- 



View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/f1346d5ddfe72f803a11d7d57448811f862266de...d25d20509eeaa4dac12f4eb198c437db65d32ad5

-- 
View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/f1346d5ddfe72f803a11d7d57448811f862266de...d25d20509eeaa4dac12f4eb198c437db65d32ad5
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/20210628/2c7e19d6/attachment-0001.htm>