[med-svn] [Git][med-team/libmaus2][master] 6 commits: fix-build-on-non-x86.patch forwarded upstream

[Étienne Mollier (@emollier)]

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


Commits:
45ddc0b5 by Étienne Mollier at 2021-08-26T11:23:03+02:00
fix-build-on-non-x86.patch forwarded upstream

- - - - -
42b7b526 by Étienne Mollier at 2021-08-26T11:30:19+02:00
d/rules: cosmetic changes

Gbp-Dch: ignore

- - - - -
e729dd6a by Étienne Mollier at 2021-08-26T13:15:43+02:00
update changelog

- - - - -
aed535f2 by Étienne Mollier at 2021-08-26T13:50:29+02:00
routine-update: Ready to upload to unstable

- - - - -
7748a230 by Étienne Mollier at 2021-08-27T22:40:10+02:00
d/control: Breaks: biobambam2 (<< 2.0.183~)

libmaus2 2.0.800 is known to break biobambam2 2.0.179.

- - - - -
5dcc41d4 by Étienne Mollier at 2021-08-27T22:44:12+02:00
update changelog for unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/fix-build-on-non-x86.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+libmaus2 (2.0.800+dfsg-3) unstable; urgency=medium
+
+  * d/control: Breaks: biobambam2 (<< 2.0.183~); testing migration caught that
+    older biobambam2 2.0.179 doesn't work with the newer libmaus2.
+
+ -- Étienne Mollier <emollier at debian.org>  Fri, 27 Aug 2021 22:44:02 +0200
+
+libmaus2 (2.0.800+dfsg-2) unstable; urgency=medium
+
+  * remove fix-test-on-32bits.patch; issue solved upstream
+  * add fix-build-on-non-x86.patch; solves ftbfs on arm64 and ppc64el
+
+ -- Étienne Mollier <emollier at debian.org>  Thu, 26 Aug 2021 13:16:28 +0200
+
 libmaus2 (2.0.800+dfsg-1) unstable; urgency=medium
 
   * fix-test-on-32bits.patch applied upstream


=====================================
debian/control
=====================================
@@ -24,6 +24,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          zlib1g
 Suggests: secrecy
+Breaks: biobambam2 (<< 2.0.183~)
 Built-Using: ${libsecrecy:Built-Using}
 Multi-Arch: same
 Description: collection of data structures and algorithms for biobambam


=====================================
debian/patches/fix-build-on-non-x86.patch
=====================================
@@ -1,6 +1,6 @@
 Description: fix build failures on non-x86 platforms
 Author: Étienne Mollier <emollier at debian.org>
-Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Forwarded: https://gitlab.com/german.tischler/libmaus2/-/issues/37
 Last-Update: 2021-08-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/


=====================================
debian/rules
=====================================
@@ -23,14 +23,17 @@ override_dh_install:
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
-	            --override s/libdeflate0-dev/libdeflate-dev/ \
-	            --override s/libmaus2_.*-dev/libmaus2-dev/ \
+		    --override s/libdeflate0-dev/libdeflate-dev/ \
+		    --override s/libmaus2_.*-dev/libmaus2-dev/ \
 		    --override 's/libnettle.*-dev/nettle-dev/' \
 		    --movedev debian/tmp/usr/include/* usr/include \
-		    --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
+		    --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" \
+			      usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
 		    debian/tmp/usr/lib/*/*.so
 	# Remove unneeded options from *.pc files
-	find debian -name "*.pc" -exec sed -i -e 's/-Wdate-time *//' -e 's/-D_FORTIFY_SOURCE=2 *//' \{\} \;
+	find debian -name "*.pc" \
+		    -exec sed -i -e 's/-Wdate-time *//' \
+				 -e 's/-D_FORTIFY_SOURCE=2 *//' \{\} \;
 	# avoid noise from dh-missing by deleting unneeded files
 	find debian/tmp -type f -name "*.la" -delete
 	# Changelog is installed via dh_installchangelogs



View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/a6b5aae3d73f420c0a45c15fe7e4fdbc480da842...5dcc41d4ca9cf475e13ec92ff284c528b4836f4b

-- 
View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/a6b5aae3d73f420c0a45c15fe7e4fdbc480da842...5dcc41d4ca9cf475e13ec92ff284c528b4836f4b
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/20210827/a24ad345/attachment-0001.htm>