Control: tags -1 + patch
Hi Kurt,
On Sun, Apr 27, 2025 at 09:06:22PM +0200, Kurt Roeckx wrote:
> > $ apt-cache show gnat-13-arm-linux-gnueabihf:amd64 | grep ^Conflicts
> > Conflicts: gnat-10-arm-linux-gnueabihf, gnat-11-arm-linux-gnueabihf,
> > gnat-12-arm-linux-gnueabihf, gnat-4.9, gnat-5-arm-linux-gnueabihf,
> > gnat-6-arm-linux-gnueabihf, gnat-7-arm-linux-gnueabihf,
> > gnat-8-arm-linux-gnueabihf, gnat-9-arm-linux-gnueabihf
> > $ apt-cache show gnat-13-arm-linux-gnueabihf:armhf | grep ^Conflicts
> > Conflicts: gnat-10, gnat-11, gnat-12, gnat-4.9, gnat-5, gnat-6, gnat-7,
> > gnat-8, gnat-9
> > $ apt-cache show gnat-13-arm-linux-gnueabihf:amd64 | grep ^Conflicts
> > Conflicts: gnat-10-arm-linux-gnueabihf, gnat-11-arm-linux-gnueabihf,
> > gnat-4.9, gnat-5-arm-linux-gnueabihf, gnat-6-arm-linux-gnueabihf,
> > gnat-7-arm-linux-gnueabihf, gnat-8-arm-linux-gnueabihf,
> > gnat-9-arm-linux-gnueabihf
>
> I assume the last is supposed to be for 12?
Thank you for correctly spotting the copy&paste mistake.
> > As you can see, gnat-13-arm-linux-gnueabihf:armhf does not conflict with
> > gnat-12-arm-linux-gnueabihf
>
> I can see that now.
>
> > and gnat-12-arm-linux-gnueabihf:amd64 does
> > not conflict with gnat-13-arm-linux-gnueabihf.
>
> But your output shows that it does (in the reverse direction)?
I'm no sure what you mean here. Just lines earlier you appeared to agree
that the reverse direction was missing the conflict.
Maybe we can more easily settle the matter given a reproducer.
$ mmdebstrap unstable /dev/null --verbose --variant=essential
--architectures=amd64,armhf
--include=gnat-13-arm-linux-gnueabihf:armhf,gnat-12-arm-linux-gnueabihf:amd64
...
Unpacking gnat-13-arm-linux-gnueabihf:armhf (13.3.0-13) ...
dpkg: error processing archive
/tmp/apt-dpkg-install-dHegLO/48-gnat-13-arm-linux-gnueabihf_13.3.0-13_armhf.deb
(--unpack):
trying to overwrite '/usr/bin/arm-linux-gnueabihf-gnatgcc', which is also in
package gnat-12-arm-linux-gnueabihf (12.4.0-5cross1)
Errors were encountered while processing:
/tmp/apt-dpkg-install-dHegLO/48-gnat-13-arm-linux-gnueabihf_13.3.0-13_armhf.deb
E: Sub-process env returned an error code (1)
$
I'm also attaching a .debdiff for what I think to be the solution here.
You may find a build with the additional conflicts at
https://debusine.debian.net/debian/developers/work-request/89768/.
Helmut
diff -Nru gcc-13-13.3.0/debian/changelog gcc-13-13.3.0/debian/changelog
--- gcc-13-13.3.0/debian/changelog 2025-03-15 07:41:49.000000000 +0100
+++ gcc-13-13.3.0/debian/changelog 2025-04-28 05:33:40.000000000 +0200
@@ -1,3 +1,10 @@
+gcc-13 (13.3.0-13.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add missing gnat conflicts.
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 28 Apr 2025 05:33:40 +0200
+
gcc-13 (13.3.0-13) unstable; urgency=medium
* Update to git 20250315 from the gcc-13 branch.
diff -Nru gcc-13-13.3.0/debian/control gcc-13-13.3.0/debian/control
--- gcc-13-13.3.0/debian/control 2025-03-15 05:22:17.000000000 +0100
+++ gcc-13-13.3.0/debian/control 2025-04-28 05:33:40.000000000 +0200
@@ -3513,7 +3513,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-alpha-linux-gnu, gnat-12, gnat-12-alpha-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the alpha-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3532,7 +3532,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-x86-64-linux-gnu, gnat-12, gnat-12-x86-64-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the x86_64-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3551,7 +3551,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-arm-linux-gnueabi, gnat-12,
gnat-12-arm-linux-gnueabi
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the arm-linux-gnueabi architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3570,7 +3570,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-arm-linux-gnueabihf, gnat-12,
gnat-12-arm-linux-gnueabihf
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the arm-linux-gnueabihf architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3589,7 +3589,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-aarch64-linux-gnu, gnat-12,
gnat-12-aarch64-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the aarch64-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3608,7 +3608,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-i686-linux-gnu, gnat-12, gnat-12-i686-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the i686-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3627,7 +3627,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mipsel-linux-gnu, gnat-12, gnat-12-mipsel-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mipsel-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3646,7 +3646,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mips64-linux-gnuabi64, gnat-12,
gnat-12-mips64-linux-gnuabi64
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mips64-linux-gnuabi64 architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3665,7 +3665,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mips64el-linux-gnuabi64, gnat-12,
gnat-12-mips64el-linux-gnuabi64
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mips64el-linux-gnuabi64 architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3684,7 +3684,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mips64-linux-gnuabin32, gnat-12,
gnat-12-mips64-linux-gnuabin32
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mips64-linux-gnuabin32 architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3703,7 +3703,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-powerpc-linux-gnu, gnat-12,
gnat-12-powerpc-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the powerpc-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3722,7 +3722,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-powerpc64-linux-gnu, gnat-12,
gnat-12-powerpc64-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the powerpc64-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3741,7 +3741,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-powerpc64le-linux-gnu, gnat-12,
gnat-12-powerpc64le-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the powerpc64le-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3760,7 +3760,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-m68k-linux-gnu, gnat-12, gnat-12-m68k-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the m68k-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3779,7 +3779,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-riscv64-linux-gnu, gnat-12,
gnat-12-riscv64-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the riscv64-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3798,7 +3798,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-sh4-linux-gnu, gnat-12, gnat-12-sh4-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the sh4-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3817,7 +3817,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-sparc64-linux-gnu, gnat-12,
gnat-12-sparc64-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the sparc64-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3836,7 +3836,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-s390x-linux-gnu, gnat-12, gnat-12-s390x-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the s390x-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3855,7 +3855,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-x86-64-linux-gnux32, gnat-12,
gnat-12-x86-64-linux-gnux32
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the x86_64-linux-gnux32 architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3874,7 +3874,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mips64el-linux-gnuabin32, gnat-12,
gnat-12-mips64el-linux-gnuabin32
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mips64el-linux-gnuabin32 architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3893,7 +3893,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mipsisa32r6-linux-gnu, gnat-12,
gnat-12-mipsisa32r6-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mipsisa32r6-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3912,7 +3912,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mipsisa32r6el-linux-gnu, gnat-12,
gnat-12-mipsisa32r6el-linux-gnu
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mipsisa32r6el-linux-gnu architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3931,7 +3931,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mipsisa64r6-linux-gnuabi64, gnat-12,
gnat-12-mipsisa64r6-linux-gnuabi64
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mipsisa64r6-linux-gnuabi64 architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3950,7 +3950,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mipsisa64r6el-linux-gnuabi64, gnat-12,
gnat-12-mipsisa64r6el-linux-gnuabi64
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mipsisa64r6el-linux-gnuabi64 architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3969,7 +3969,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mipsisa64r6-linux-gnuabin32, gnat-12,
gnat-12-mipsisa64r6-linux-gnuabin32
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mipsisa64r6-linux-gnuabin32 architecture
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3988,7 +3988,7 @@
Suggests: gnat-13-doc, ada-reference-manual-2012
Provides: gnat-13-${libgnat:alihash}
Conflicts: gnat-4.9, gnat-5, gnat-6, gnat-7, gnat-8, gnat-9,
- gnat-10, gnat-11, gnat-12,
+ gnat-10, gnat-11, gnat-11-mipsisa64r6el-linux-gnuabin32, gnat-12,
gnat-12-mipsisa64r6el-linux-gnuabin32
# Previous versions conflict for (at least) /usr/bin/gnatmake.
Description: GNU Ada compiler for the mipsisa64r6el-linux-gnuabin32
architecture
GNAT is a compiler for the Ada programming language. It produces optimized
diff -Nru gcc-13-13.3.0/debian/control.m4 gcc-13-13.3.0/debian/control.m4
--- gcc-13-13.3.0/debian/control.m4 2025-03-15 05:22:10.000000000 +0100
+++ gcc-13-13.3.0/debian/control.m4 2025-04-28 05:32:56.000000000 +0200
@@ -4957,7 +4957,7 @@
Provides: gnat`'-GNAT_V-${libgnat:alihash}
')`'dnl
Conflicts: gnat-4.9, gnat-5`'TS, gnat-6`'TS, gnat-7`'TS, gnat-8`'TS,
gnat-9`'TS,
- gnat-10`'TS, gnat-11`'TS, gnat-12`'TS,
+ gnat-10`'TS, gnat-11`'TS, gnat-11`'arch_gnusuffix, gnat-12`'TS,
gnat-12`'arch_gnusuffix
# Previous versions conflict for (at least) /usr/bin/gnatmake.
BUILT_USING`'dnl
Description: GNU Ada compiler for the arch_gnu architecture
