Author: djpig
Date: 2005-12-17 19:17:43 +0100 (Sat, 17 Dec 2005)
New Revision: 515

Modified:
   trunk/checks/files
   trunk/checks/shared-libs
   trunk/debian/changelog
Log:
 * checks/files:
   + [FL] forgot /lib(32|64) (more #328612 fixes)
 * checks/shared-libs:
   + [FL] forgot /lib(32|64) (hopefully finally closes: #328612)


Modified: trunk/checks/files
===================================================================
--- trunk/checks/files  2005-12-17 17:31:16 UTC (rev 514)
+++ trunk/checks/files  2005-12-17 18:17:43 UTC (rev 515)
@@ -372,7 +372,7 @@
     }
     # ---------------- FHS directory?
     elsif ($file =~ m,^[^/]+/$, and $file ne './' and
-          $file !~ 
m,^(bin|boot|dev|etc|home|lib|mnt|opt|root|sbin|tmp|usr|var)/,) { # Make an 
exception for the base-files package here, because it
+          $file !~ 
m,^(bin|boot|dev|etc|home|lib(64|32)?|mnt|opt|root|sbin|tmp|usr|var)/,) { # 
Make an exception for the base-files package here, because it
        # installs a slew of top-level directories for setting up the
        # base system.  (Specifically, /cdrom, /floppy, /initrd, and /proc
        # are not mentioned in the FHS).
@@ -398,9 +398,9 @@
     if ($perm !~ m/^d/) {
        unless ($type eq 'udeb' or
                $file =~ m,^usr/(bin|dict|doc|games|
-                                include|info|lib|lib32|lib64|
+                                include|info|lib(32|64)?|
                                 man|sbin|share|src|X11R6)/,x or
-               $file =~ m,^lib/(modules/|libc5-compat/)?, 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
                # non-FHS, but still usual

Modified: trunk/checks/shared-libs
===================================================================
--- trunk/checks/shared-libs    2005-12-17 17:31:16 UTC (rev 514)
+++ trunk/checks/shared-libs    2005-12-17 18:17:43 UTC (rev 515)
@@ -28,6 +28,8 @@
 
 my %ldso_dir = map { $_ => 1 }
     qw( lib
+       lib32
+       lib64
         usr/lib
        usr/lib32
        usr/lib64

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2005-12-17 17:31:16 UTC (rev 514)
+++ trunk/debian/changelog      2005-12-17 18:17:43 UTC (rev 515)
@@ -15,6 +15,10 @@
     + [FL] support c2a suffix in soname check, too (Closes: #340856)
   * checks/debhelper:
     + [FL] debhelper compat level 3 is deprecated as well now (Closes: #340222)
+  * checks/files:
+    + [FL] forgot /lib(32|64) (more #328612 fixes)
+  * checks/shared-libs:
+    + [FL] forgot /lib(32|64) (hopefully finally closes: #328612)
 
  --
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to