[debian-mysql] Bug#1140296: libmariadb-dev multi-arch — patch series attached

[Dick Hollenbeck]

Control: tags -1 + patch
Control: tags 1140151 + patch

Hi,

Thanks for the go-ahead. Rather than open a salsa MR I'm attaching the
change as a git patch series (generated against the debian/ packaging of
1:11.8.8-1) — happy to push it as an MR instead if you'd prefer, just say
so. You should be able to apply it directly:

     git am 0001-*.patch 0002-*.patch 0003-*.patch

Three commits, all under debian/ (no upstream/quilt patch needed — the
header split is done at build time in debian/rules):

   0001  libmariadb-dev: Multi-Arch: same. Replaces the per-arch compiled
         /usr/bin/mariadb_config with an architecture-independent shell
         script (derives the multiarch triplet at runtime), and moves the
         two arch-varying macros of mariadb_version.h (MARIADB_MACHINE_TYPE,
         MARIADB_PLUGINDIR) into a per-arch triplet stub header so the public
         header is byte-identical across arches. The header is deliberately
         NOT relocated — mysql.h includes it with quotes.   (Closes: #1140296)

   0002  libmariadb-dev-compat: Multi-Arch: same, and drop the two
         self-provided transitional virtuals from Conflicts/Breaks. Marking
         it M-A: same alone is not enough — two arch instances otherwise
         break each other via those virtuals.              (Closes: #1140151)

   0003  changelog entry (1:11.8.8-2 / UNRELEASED — drop or regenerate via
         gbp dch as you like).

What I verified locally (by transforming the real 11.8.6 binaries into this
exact end state): all shared-path files become byte-identical across amd64
and arm64; libmariadb-dev + libmariadb-dev-compat co-install for both arches;
#include <mysql.h> still compiles and links; and mariadb_config output is
unchanged (--cflags/--libs/--plugindir/--version=11.8.6/...). I could not run
a full source build here, so the buildd/CI pass on amd64+arm64 is the final
gate — which is exactly what this targets, since the previous failures you
mentioned were the cross-arch identical-files check.

One thing worth a look before merge: please sanity-check the shell
mariadb_config's flag set against the current compiled binary, in case
something relies on a flag it doesn't yet implement.

Thanks,
Dick Hollenbeck
-------------- next part --------------
A non-text attachment was scrubbed...
Name: HOWTO-apply-and-push.md
Type: text/markdown
Size: 2224 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-mysql-maint/attachments/20260625/705a6bb2/attachment-0001.md>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-changelog-document-multi-arch-co-installability-fix-.patch
Type: text/x-patch
Size: 1278 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-mysql-maint/attachments/20260625/705a6bb2/attachment-0003.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-libmariadb-dev-compat-make-Multi-Arch-same-co-instal.patch
Type: text/x-patch
Size: 1757 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-mysql-maint/attachments/20260625/705a6bb2/attachment-0004.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-libmariadb-dev-make-Multi-Arch-same-co-installable.patch
Type: text/x-patch
Size: 5606 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-mysql-maint/attachments/20260625/705a6bb2/attachment-0005.bin>