Bug#646817: [checks/binaries] false positive binary-or-shlib-defines-rpath for /usr/lib/$(DEB_HOST_MULTIARCH)/<packagename>

[Jakub Wilk <jwilk@debian.org>]

Package: lintian
Version: 2.5.3
Severity: normal
User: multiarch-devel@lists.alioth.debian.org
Usertags: multiarch
Tags: patch

After I converted cuneiform to multi-arch, I get this lintian error:

E: cuneiform: binary-or-shlib-defines-rpath usr/bin/cuneiform /usr/lib/i386-linux-gnu/cuneiform

Of course, this is false positive. Patch attached.

--
Jakub Wilk

diff --git a/checks/binaries b/checks/binaries
--- a/checks/binaries
+++ b/checks/binaries
@@ -314,7 +314,7 @@
     # rpath is disallowed, except in private directories
     if (exists $objdump->{RPATH}) {
         foreach my $rpath (map {File::Spec->canonpath($_)} keys %{$objdump->{RPATH}}) {
-            next if $rpath =~ m,^/usr/lib/(?:games/)?(?:\Q$pkg\E|\Q$srcpkg\E)(?:/|\z),;
+            next if $rpath =~ m,^/usr/lib/(?:$madir/)?(?:games/)?(?:\Q$pkg\E|\Q$srcpkg\E)(?:/|\z),;
             next if $rpath =~ m,^\$\{?ORIGIN\}?,;
             next if $directories{$rpath} and $rpath !~ m,^(?:/usr)?/lib(?:/$madir)?/?\z,;
             tag 'binary-or-shlib-defines-rpath', "$file $rpath";