lintian: r1119 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2008-01-05 23:52:07 +0100 (Sat, 05 Jan 2008)
New Revision: 1119

Modified:
   trunk/checks/files
   trunk/checks/shared-libs
   trunk/debian/changelog
Log:
  + [RA] Allow /emul as a top-level directory and files in
    /emul/ia32-linux/{lib,usr/lib}.  (Closes: #459254)
  + [RA] ld.so may also look in /emul/ia32-linux/{lib,usr/lib}.

Modified: trunk/checks/files
===================================================================
--- trunk/checks/files	2008-01-05 22:33:41 UTC (rev 1118)
+++ trunk/checks/files	2008-01-05 22:52:07 UTC (rev 1119)
@@ -446,10 +446,14 @@
 	# packages because they install a slew of top-level directories for
 	# setting up the base system.  (Specifically, /cdrom, /floppy,
 	# /initrd, and /proc are not mentioned in the FHS).
+	#
+	# Also make an exception for /emul, which is used for multiarch
+	# support in Debian at the moment.
 	tag "non-standard-toplevel-dir", "$file"
 	    unless $pkg eq 'base-files'
-	    or $pkg eq 'hurd'
-	    or $pkg =~ /^rootskel(-bootfloppy)?/;
+		or $pkg eq 'hurd'
+		or $pkg =~ /^rootskel(-bootfloppy)?/
+		or $file =~ m,^emul/,;
     }
 
     # ---------------- compatibility symlinks should not be used
@@ -466,16 +470,17 @@
 
     # ---------------- any files
     if ($perm !~ m/^d/) {
-	unless ($type eq 'udeb' or
-		$file =~ m,^usr/(bin|dict|doc|games|
-				 include|info|lib(32|64)?|
-				 man|sbin|share|src|X11R6)/,x or
-		$file =~ m,^lib(32|64)?/(modules/|libc5-compat/)?, or
-		$file =~ m,^var/(games|lib|www|named)/, or
-		$file =~ m,^(bin|boot|dev|etc|sbin)/, or
+	unless ($type eq 'udeb'
+		or $file =~ m,^usr/(bin|dict|doc|games|
+				    include|info|lib(32|64)?|
+				    man|sbin|share|src|X11R6)/,x
+		or $file =~ m,^lib(32|64)?/(modules/|libc5-compat/)?,
+		or $file =~ m,^var/(games|lib|www|named)/,
+		or $file =~ m,^(bin|boot|dev|etc|sbin)/,
 		# non-FHS, but still usual
-		$file =~ m,^usr/[^/]+-linux[^/]*/, or
-		$file =~ m,^usr/iraf/,) {
+		or $file =~ m,^usr/[^/]+-linux[^/]*/,
+		or $file =~ m,^usr/iraf/,
+		or $file =~ m,^emul/ia32-linux/(lib|usr/lib)/,) {
 	    tag "file-in-unusual-dir", "$file";
 	}
     }

Modified: trunk/checks/shared-libs
===================================================================
--- trunk/checks/shared-libs	2008-01-05 22:33:41 UTC (rev 1118)
+++ trunk/checks/shared-libs	2008-01-05 22:52:07 UTC (rev 1119)
@@ -40,6 +40,8 @@
         usr/X11R6/lib
         usr/lib/libc5-compat
         lib/libc5-compat
+	emul/ia32-linux/lib
+	emul/ia32-linux/usr/lib
       );
 
 # Libraries that should only be used in the presence of certain capabilities

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-05 22:33:41 UTC (rev 1118)
+++ trunk/debian/changelog	2008-01-05 22:52:07 UTC (rev 1119)
@@ -49,6 +49,8 @@
     + [RA] Ignore zero-length files in /usr/share/doc/examples.
     + [RA] The underFooLicense.docbook files from KDE are not license
       files.  Thanks, Sune Vuorela.  (Closes: #458831)
+    + [RA] Allow /emul as a top-level directory and files in
+      /emul/ia32-linux/{lib,usr/lib}.  (Closes: #459254)
   * checks/files.desc:
     + [RA] Remove a stray variable from the config-file-reserved tag.
   * checks/init.d{.desc,}:
@@ -84,6 +86,7 @@
     + [RA] New check for version numbers in symbol files.  Based on a
       patch from Raphael Hertzog.  (Closes: #457067)
     + [RA] Exclude nsswitch modules from shlibs file checks.
+    + [RA] ld.so may also look in /emul/ia32-linux/{lib,usr/lib}.
 
   * debian/control:
     + [RA] Suggest libtext-template-perl, needed for HTML reporting.