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

[SCM] Debian package checker branch, master, updated. 2.5.0-46-g1f31713



The following commit has been merged in the master branch:
commit 1f31713dedacd58816780f099979917471fc4357
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jun 11 10:28:43 2011 +0200

    Limit multiarch-support check to real files
    
    Previously it would also check symlinks.

diff --git a/checks/files b/checks/files
index e9efaf4..ee82f03 100644
--- a/checks/files
+++ b/checks/files
@@ -729,7 +729,8 @@ foreach my $file (@{$info->sorted_index}) {
 	}
     }
 
-    if ($type ne 'udeb' && $pkg !~ m/^libc[0-9]/o && $file =~ m,^(?:usr/)?lib/([^/]+)/lib[^/]+(?:-\d[^/]*\.so|\.so\.[^/]+)$,o) {
+    if ($type ne 'udeb' && $index_info->{type} ne 'l' && $pkg !~ m/^libc[0-9]/o &&
+	    $file =~ m,^(?:usr/)?lib/([^/]+)/lib[^/]+\.so(?:\.[^/]+)?$,o) {
 	my $subdir = $1;
 	$TRIPLETS = Lintian::Data->new('files/triplets', '\s+')
 	    unless defined($TRIPLETS);
diff --git a/debian/changelog b/debian/changelog
index 49fea2f..540ef18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,11 @@ lintian (2.5.1) UNRELEASED; urgency=low
       (Closes: #628754)
     + [NT] Added bad-perm-for-file-in-etc-sudoers.d tag.
       (Closes: #588831)
-    + [CW] Don't issue missing-pre-dependency-on-multiarch-support for
+    + [CW] Do not issue missing-pre-dependency-on-multiarch-support for
       udebs.
+    + [NT] Limit missing-pre-dependency-on-multiarch-support to real
+      files only.  Previously it would also check symlinks.
+      (Closes: #629648)
   * checks/java{,.desc}:
     + [NT] Sort the jar files by name, so they are checked in the same
       order.

-- 
Debian package checker


Reply to: