Merge ~paelzer/britney/+git/hints-ubuntu:bump-marisa-hirsute into ~ubuntu-release/britney/+git/hints-ubuntu:devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

FYI: blocks ruby2.7 atm

[Steve Langasek (vorlon)]

The expectation is that these failures DO get investigated before the next migration, instead of just kicking the can down the road.

This failure is a very commonplace failure of a build test due to the test not being set up for cross-building, and is trivially fixed.

I've uploaded a fix for the failing autopkgtest.

review: Disapprove

[Christian Ehrhardt  (paelzer)]

Yeah I have - after opening this MP - worked on a different package which needed a very similar cross package testing change and think I'd now recognize it.
I still struggle a bit with CMake's find_package in that context, but other than that I'm now aware of this kind of issues.

Thanks for already doing this for Marisa Steve!

Unmerged commits

034afc0... by Christian Ehrhardt  on 2020-11-09

marisa: bump version

This was one of the i386 that has to be checked in more detail to
decide. That has not yet happened but since the version got a few buildX
suffixes the old override does not more apply.

Bump the version to the one currently in hirsute universe/proposed.

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/ubuntu-release b/ubuntu-release
index 84fafa7..5438e0e 100644
--- a/ubuntu-release
+++ b/ubuntu-release
@@ -10673,7 +10673,7 @@ force-badtest libinih/50-1/i386
 force-reset-test libofa/0.9.3-19/i386
 force-reset-test libsoxr/0.1.3-3/i386
 force-badtest libthai/0.1.28-3/i386
-force-badtest marisa/0.2.6-1/i386
+force-badtest marisa/0.2.6-1build1/i386 marisa/0.2.6-1build2/i386
 force-badtest nss-wrapper/1.1.3-1/i386
 force-badtest pupnp-1.8/1:1.8.4-2ubuntu2/i386
 force-badtest sdlgfx/2.0.25-11/i386