[med-svn] [Git][med-team/libmaus2][master] 8 commits: routine-update: New upstream version

[Étienne Mollier (@emollier)]

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


Commits:
db5948df by Étienne Mollier at 2021-09-12T12:38:30+02:00
routine-update: New upstream version

- - - - -
f5b8dc1b by Étienne Mollier at 2021-09-12T12:38:31+02:00
New upstream version 2.0.803+dfsg
- - - - -
c8d02e7e by Étienne Mollier at 2021-09-12T12:38:54+02:00
Update upstream source from tag 'upstream/2.0.803+dfsg'

Update to upstream version '2.0.803+dfsg'
with Debian dir a4167160f6b83d7233aa7e976237cce2ddf94130
- - - - -
e238804d by Étienne Mollier at 2021-09-12T13:13:39+02:00
delete fix-ftbfs-on-i386.patch; applied upstream

- - - - -
fcefa696 by Étienne Mollier at 2021-09-12T13:15:29+02:00
d/control: Standard-Version: 4.6.0.1

- - - - -
39d55c0c by Étienne Mollier at 2021-09-12T13:16:56+02:00
d/control: shuffle Multi-Arch:same

Gbp-Dch: ignore

- - - - -
603cd00b by Étienne Mollier at 2021-09-12T13:18:03+02:00
update changelog

- - - - -
f084ae20 by Étienne Mollier at 2021-09-12T19:19:49+02:00
ready to upload to unstable

- - - - -


7 changed files:

- ChangeLog
- configure.ac
- debian/changelog
- debian/control
- − debian/patches/fix-ftbfs-on-i386.patch
- − debian/patches/series
- src/test/testsort.cpp


Changes:

=====================================
ChangeLog
=====================================
@@ -1,3 +1,9 @@
+libmaus2 (2.0.803-1) unstable; urgency=medium
+
+  * Reduce size of test in testsort as it does not compile on x86
+
+ -- German Tischler-Höhle <germant at miltenyibiotec.de>  Mon, 06 Sep 2021 10:16:41 +0200
+
 libmaus2 (2.0.802-1) unstable; urgency=medium
 
   * Fix compilation without libdeflate


=====================================
configure.ac
=====================================
@@ -1,5 +1,5 @@
-AC_INIT(libmaus2,2.0.802,[germant at miltenyibiotec.de],[libmaus2],[https://gitlab.com/german.tischler/libmaus2])
-LIBRARY_VERSION=2:802:0
+AC_INIT(libmaus2,2.0.803,[germant at miltenyibiotec.de],[libmaus2],[https://gitlab.com/german.tischler/libmaus2])
+LIBRARY_VERSION=2:803:0
 AC_MSG_NOTICE([Configuring for source in directory ${srcdir}])
 AC_CANONICAL_SYSTEM
 AC_CANONICAL_HOST


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libmaus2 (2.0.803+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 2.0.803+dfsg
+  * delete fix-ftbfs-on-i386.patch; applied upstream
+  * d/control: Standard-Version: 4.6.0.1
+
+ -- Étienne Mollier <emollier at debian.org>  Sun, 12 Sep 2021 19:19:23 +0200
+
 libmaus2 (2.0.802+dfsg-2) unstable; urgency=medium
 
   * add fix-ftbfs-on-i386.patch


=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
                libsecrecy-dev,
                pkg-config,
                zlib1g-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.0.1
 Vcs-Browser: https://salsa.debian.org/med-team/libmaus2
 Vcs-Git: https://salsa.debian.org/med-team/libmaus2.git
 Homepage: https://gitlab.com/german.tischler/libmaus2
@@ -19,6 +19,7 @@ Rules-Requires-Root: no
 
 Package: libmaus2-2
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -26,7 +27,6 @@ Depends: ${shlibs:Depends},
 Suggests: secrecy
 Breaks: biobambam2 (<< 2.0.183~)
 Built-Using: ${libsecrecy:Built-Using}
-Multi-Arch: same
 Description: collection of data structures and algorithms for biobambam
  Libmaus2 is a collection of data structures and algorithms. It contains
  .


=====================================
debian/patches/fix-ftbfs-on-i386.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Description: fix ftbfs on i386
-Author: Étienne Mollier <emollier at debian.org>
-Forwarded: https://gitlab.com/german.tischler/libmaus2/-/issues/37
-Last-Update: 2021-09-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- libmaus2.orig/src/test/testsort.cpp
-+++ libmaus2/src/test/testsort.cpp
-@@ -1338,7 +1338,7 @@
- 		}
- 
- 	{
--		std::size_t const n = 1024*1024*1024;
-+		std::size_t const n = 256*1024*1024;
- 		std::size_t const threads = 24;
- 
- 		std::cerr << "filling array...";


=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-fix-ftbfs-on-i386.patch


=====================================
src/test/testsort.cpp
=====================================
@@ -1338,7 +1338,7 @@ int main()
 		}
 
 	{
-		std::size_t const n = 1024*1024*1024;
+		std::size_t const n = 1024*1024;
 		std::size_t const threads = 24;
 
 		std::cerr << "filling array...";



View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/54cad94c85a290a8b38f14956abbd610f7709a1f...f084ae20fc24b5bc60adeb5f7caea0d2ded8b70a

-- 
View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/54cad94c85a290a8b38f14956abbd610f7709a1f...f084ae20fc24b5bc60adeb5f7caea0d2ded8b70a
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/20210912/880228c3/attachment-0001.htm>