lintian: r499 - in trunk: checks debian

[djpig@debian.org]

Author: djpig
Date: 2005-09-22 00:05:40 +0200 (Thu, 22 Sep 2005)
New Revision: 499

Modified:
   trunk/checks/files
   trunk/checks/shared-libs
   trunk/debian/changelog
Log:
Don't issue false errors related to lib(32|64) (Closes: #328612)


Modified: trunk/checks/files
===================================================================
--- trunk/checks/files	2005-09-21 21:52:03 UTC (rev 498)
+++ trunk/checks/files	2005-09-21 22:05:40 UTC (rev 499)
@@ -303,7 +303,11 @@
 		tag "FSSTND-dir-in-usr", "$file";
 	    }
 	    # FHS dirs
-	    elsif ( $file !~ m,^usr/(X11R6|X386|bin|games|include|lib|local|sbin|share|src|spool|tmp)/, ) {
+	    elsif ( $file !~ m,^usr/(X11R6|X386|
+				     bin|games|include|
+				     lib|lib32|lib64|
+				     local|sbin|share|
+				     src|spool|tmp)/,x ) {
 		tag "non-standard-dir-in-usr", "$file";
 	    } elsif ( $file =~ m,^usr/share/doc, ) {
 		tag "uses-FHS-doc-dir", "$file";
@@ -393,7 +397,9 @@
     # ---------------- any files
     if ($perm !~ m/^d/) {
 	unless ($type eq 'udeb' or
-		$file =~ m,^usr/(bin|dict|doc|games|include|info|lib|man|sbin|share|src|X11R6)/, or
+		$file =~ m,^usr/(bin|dict|doc|games|
+				 include|info|lib|lib32|lib64|
+				 man|sbin|share|src|X11R6)/,x or
 		$file =~ m,^lib/(modules/|libc5-compat/)?, or
 		$file =~ m,^var/(games|lib|www|named)/, or
 		$file =~ m,^(bin|boot|dev|etc|sbin)/, or

Modified: trunk/checks/shared-libs
===================================================================
--- trunk/checks/shared-libs	2005-09-21 21:52:03 UTC (rev 498)
+++ trunk/checks/shared-libs	2005-09-21 22:05:40 UTC (rev 499)
@@ -29,6 +29,8 @@
 my %ldso_dir = map { $_ => 1 }
     qw( lib
         usr/lib
+	usr/lib32
+	usr/lib64
         usr/lib/libg++-dbg
         usr/X11R6/lib/Xaw3d
         usr/local/lib

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-09-21 21:52:03 UTC (rev 498)
+++ trunk/debian/changelog	2005-09-21 22:05:40 UTC (rev 499)
@@ -10,6 +10,9 @@
   * checks/files:
     + [FL] Add some formats to the exception list for extra-license-file
       (jpe?g, gif and svg) (Closes: #324944)
+    + [FL] Don't complain about lib(32|64) as unusual directories. Noted
+      by Matthias Klose (partly fixes #328612, see checks/shared-libs for
+      the rest)
   * checks/scripts:
     + [FL] PythonX.Y dependency can also be satisfied with pythonX.Y-minimal.
       Noted by Matthias Klose (Closes: #326643)
@@ -17,6 +20,8 @@
     + [HE] Apply patch from Bastian Blank to check for executable stacks in
       binaries. New checks are called shlib-without-PT_GNU_STACK-section,
       shlib-with-executable-stack, thanks waldi. (Closes: #321750)
+    + [FL] Add lib(32|64) to ldso directories. Pointed out by
+      Matthias Klose (Closes: #328612)
 
  -- Frank Lichtenheld <frank@lichtenheld.de>  Fri,  9 Sep 2005 07:15:00 +0200