[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.1-218-g688f92e



The following commit has been merged in the master branch:
commit c8dcc804801e3aca4082568300d2a4dfb17da8c2
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Aug 10 17:30:40 2011 +0200

    Fixed false-negative with rpaths using multi-arch dir

diff --git a/checks/binaries b/checks/binaries
index 6fd9cea..fa2079b 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -315,7 +315,7 @@ foreach my $file (@{$info->sorted_file_info}) {
 	foreach my $rpath (map {File::Spec->canonpath($_)} keys %{$objdump->{RPATH}}) {
 	    next if $rpath =~ m,^/usr/lib/(?:games/)?\Q$pkg\E(?:/|\z),;
 	    next if $rpath =~ m,^\$\{?ORIGIN\}?,;
-	    next if $directories{$rpath} and $rpath !~ m,^(?:/usr)?/lib/?\z,;
+	    next if $directories{$rpath} and $rpath !~ m,^(?:/usr)?/lib(?:/$madir)?/?\z,;
 	    tag 'binary-or-shlib-defines-rpath', "$file $rpath";
 	}
     }
diff --git a/debian/changelog b/debian/changelog
index 2728d09..bc842ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ lintian (2.5.2) UNRELEASED; urgency=low
     + [NT] Emit "arch-dependent-file-in-usr-share" and
       "binary-in-etc" also for static compiled files.  Thanks to
       Jakub Wilk for the report and the patch.  (Closes: #635354)
+    + [NT] Fixed false-negative for rpath, if the rpath included
+      the multi-arch dir.  Thanks to Jakub Wilk for the report and
+      the patch.  (Closes: #637259)
   * checks/changelog-file:
     + [NT] Removed exception for symlinked changelogs if the
       package had an Ubuntu version.  This exception is now

-- 
Debian package checker


Reply to: