Author: rra
Date: 2008-03-20 21:25:22 +0100 (Thu, 20 Mar 2008)
New Revision: 1267

Modified:
   trunk/checks/files
   trunk/debian/changelog
Log:
  + [RA] Don't consider files in bin directories that contain "copying"
    or "license" to be extra license files.

Modified: trunk/checks/files
===================================================================
--- trunk/checks/files  2008-03-14 21:17:47 UTC (rev 1266)
+++ trunk/checks/files  2008-03-20 20:25:22 UTC (rev 1267)
@@ -580,9 +580,9 @@
 
     # ---------------- license files
     if ($file =~ m,(copying|licen[cs]e)(\.[^/]+)?$,i
-       # Ignore some common extensions; there was at least one file
-       # named "license.el".  These are probably license-displaying
-       # code, not license files.
+       # Ignore some common extensions; there was at least one file named
+       # "license.el".  These are probably license-displaying code, not
+       # license files.  Also ignore binaries in /usr/bin and friends.
        #
        # Another exception is made for .html and .php because preserving
        # working links is more important than saving some bytes, and
@@ -596,6 +596,7 @@
        and not $file =~ 
m/\.(el|c|h|py|cc|pl|pm|html|php|rb|xpm|png|jpe?g|gif|svg|dtd)$/
        and not $file =~ m,^usr/share/zope/Products/.*\.(dtml|pt|cpt)$,
        and not $file =~ m,/under\S+License\.docbook$,
+       and not $file =~ m,^(usr/)?s?bin/,
        and not defined $link) {
        tag "extra-license-file", "$file";
     }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-03-14 21:17:47 UTC (rev 1266)
+++ trunk/debian/changelog      2008-03-20 20:25:22 UTC (rev 1267)
@@ -26,6 +26,8 @@
     + [RA] Issue errors for installing files under /var/www.  This isn't
       in FHS, may not be the document root, and may break local files if
       it is the document root.  Thanks, Joerg Jaspert.  (Closes: #470403)
+    + [RA] Don't consider files in bin directories that contain "copying"
+      or "license" to be extra license files.
   * checks/scripts:
     + [RA] Attempt to quash some Perl warnings.
     + [RA] *.py files in /usr/{lib,share}, /etc/init.d/skeleton, and *.ex


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

Reply via email to