On Tue, Mar 05, 2024 at 11:47:39AM +0100, Sven Joachim wrote: > Package: perl-base > Version: 5.38.2-3.1 > Severity: serious > X-Debbugs-Cc: Sven Joachim <svenj...@gmx.de>, Steve Langasek > <vor...@debian.org>
> On i386, perl-base provides perlapi-5.38.2t64 rather than > perlapi-5.38.2. This makes tons of packages uninstallable or > unbuildable and is not what has been agreed upon in #1060246. > The reason is a bad check in debian/rules, line 31: > ,---- > | # If nonempty, this will determine $Config{debian_abi} and Provides: entries > | # (otherwise, the Provides: entries will be generated by debian/mkprovides) > | perlabi = > | ifeq (,$(filter $(DEB_HOST_GNU_TYPE),i386 hurd-i386)) > | ifeq ($(DEB_HOST_ARCH_BITS),32) > | perlabi = 5.38.2t64 > | endif > | endif > `---- Sorry about this. Clearly, was untested on i386! I think it's preferable here to check DEB_HOST_ARCH, which was my intention, rather than DEB_HOST_GNU_TYPE. I've uploaded an NMU to that effect. Please see the NMU debdiff attached. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru perl-5.38.2/debian/changelog perl-5.38.2/debian/changelog --- perl-5.38.2/debian/changelog 2024-03-02 21:34:58.000000000 +0000 +++ perl-5.38.2/debian/changelog 2024-03-06 17:19:01.000000000 +0000 @@ -1,3 +1,12 @@ +perl (5.38.2-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix check for i386 to avoid transitioning there. Closes: #1065483. + * Manually add perlapi-5.38.2t64 to Provides: on i386 to avoid another + difficult transition. + + -- Steve Langasek <vor...@debian.org> Wed, 06 Mar 2024 17:19:01 +0000 + perl (5.38.2-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru perl-5.38.2/debian/control perl-5.38.2/debian/control --- perl-5.38.2/debian/control 2024-03-02 21:34:58.000000000 +0000 +++ perl-5.38.2/debian/control 2024-03-06 17:19:01.000000000 +0000 @@ -81,6 +81,7 @@ libfile-temp-perl (= 0.2311), libfile-path-perl (= 2.18), libio-socket-ip-perl (= 0.41), + perlapi-5.38.2t64 [i386 hurd-i386], Suggests: perl, sensible-utils Description: minimal Perl system Perl is a scripting language used in many system scripts and utilities. diff -Nru perl-5.38.2/debian/rules perl-5.38.2/debian/rules --- perl-5.38.2/debian/rules 2024-03-02 21:34:58.000000000 +0000 +++ perl-5.38.2/debian/rules 2024-03-06 17:18:00.000000000 +0000 @@ -24,13 +24,14 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) # If nonempty, this will determine $Config{debian_abi} and Provides: entries # (otherwise, the Provides: entries will be generated by debian/mkprovides) perlabi = -ifeq (,$(filter $(DEB_HOST_GNU_TYPE),i386 hurd-i386)) +ifeq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386)) ifeq ($(DEB_HOST_ARCH_BITS),32) - perlabi = 5.38.2t64 + perlabi = 5.38.2t64 endif endif
signature.asc
Description: PGP signature