Bug#1090932: dh-puredata: autopkgtest fails with debhelper 13.22

[Zixing Liu]

Package: dh-puredata
Version: 3.2.0
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu plucky ubuntu-patch

Dear Maintainer,

This fixes the compatibility issues with debhelper 13.22+.

In Ubuntu, the attached patch was applied to achieve the following:

  * pd_lib_builder.pm: set DEB_HOST_ARCH for compatibility
    also disregard the `install` subroutine results from newer debhelper
  * tests: include /usr/share/dpkg/architecture.mk file


Thanks for considering the patch.


-- System Information:
Debian Release: trixie/sid
  APT prefers oracular-updates
  APT policy: (500, 'oracular-updates'), (500, 'oracular-security'), (500, 
'oracular'), (100, 'oracular-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.11.0-12-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

diff -Nru dh-puredata-3.2.0/Debhelper/Buildsystem/pd_lib_builder.pm 
dh-puredata-3.2.0ubuntu1/Debhelper/Buildsystem/pd_lib_builder.pm
--- dh-puredata-3.2.0/Debhelper/Buildsystem/pd_lib_builder.pm   2024-06-14 
04:13:15.000000000 -0600
+++ dh-puredata-3.2.0ubuntu1/Debhelper/Buildsystem/pd_lib_builder.pm    
2024-12-20 14:23:07.000000000 -0700
@@ -79,8 +79,11 @@
     my $result = $this->$fun(@_);
 
     my $can_double = check_can_double;
-    if ($ENV{DEB_HOST_ARCH} eq "") {
-        $can_double = 0;
+    $ENV{DEB_HOST_ARCH} = dpkg_architecture_value("DEB_HOST_ARCH");
+    if ($result eq "" and $fun eq "SUPER::install") {
+        # in newer debhelper,
+        # Debian::Debhelper::Buildsystem::makefile::install does not return 
any value
+        $result = 1;
     }
     # double flavour
     if ($can_double and ($result or $ignore_result)) {
diff -Nru dh-puredata-3.2.0/tests/myobj/debian/rules 
dh-puredata-3.2.0ubuntu1/tests/myobj/debian/rules
--- dh-puredata-3.2.0/tests/myobj/debian/rules  2024-06-14 04:13:15.000000000 
-0600
+++ dh-puredata-3.2.0ubuntu1/tests/myobj/debian/rules   2024-12-20 
13:10:08.000000000 -0700
@@ -1,3 +1,4 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
 %:
        dh $@ --buildsystem=pd_lib_builder