lintian: rev 8 - in trunk: checks debian

[djpig@wolffelaar.nl]

Author: djpig
Date: 2004-01-31 23:36:44 +0100 (Sat, 31 Jan 2004)
New Revision: 8

Modified:
   trunk/checks/copyright-file
   trunk/debian/changelog
Log:
checks/copyright-file: don't complain about missing reference to
 the GPL if we already detected a wrong reference (Closes: #225837)


Modified: trunk/checks/copyright-file
===================================================================
--- trunk/checks/copyright-file	2004-01-31 20:51:12 UTC (rev 7)
+++ trunk/checks/copyright-file	2004-01-31 22:36:44 UTC (rev 8)
@@ -126,6 +126,8 @@
 undef $/;  $_ = <IN>;
 close(IN);
 
+my $wrong_directory_detected = 0;
+
 if (m/\<fill in ftp site\>/ or m/\<Must follow here\>/) {
     print "E: $pkg $type: helper-templates-in-copyright\n";
 }
@@ -136,14 +138,17 @@
 
 if (m,usr/share/common-licences,) {
     print "E: $pkg $type: copyright-refers-to-incorrect-directory $&\n";
+    $wrong_directory_detected = 1;
 }
 
 if (m,usr/share/doc/copyright,) {
     print "E: $pkg $type: copyright-refers-to-old-directory\n";
+    $wrong_directory_detected = 1;
 }
 
 if (m,usr/doc/copyright,) {
     print "E: $pkg $type: copyright-refers-to-old-directory\n";
+    $wrong_directory_detected = 1;
 }
 
 # lame check for old FSF zip code
@@ -172,7 +177,7 @@
 
 if (m/(GNU General Public License|GPL)/ && !m,/usr/share/common-licenses,
     && !m/Zope Public License/ && !m/LICENSE AGREEMENT FOR PYTHON 1.6.1/
-    && !m/LaTeX Project Public License/) {
+    && !m/LaTeX Project Public License/ && !$wrong_directory_detected) {
     print "E: $pkg $type: copyright-should-refer-to-common-license-file-for-gpl\n";
 }
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-01-31 20:51:12 UTC (rev 7)
+++ trunk/debian/changelog	2004-01-31 22:36:44 UTC (rev 8)
@@ -19,6 +19,8 @@
    * checks/manpages: 
      + push back the extension after testing for
        manpage-not-compressed (Closes: #225293)
+   * checks/copyright-file: don't complain about missing reference to
+      the GPL if we already detected a wrong reference (Closes: #225837)
 
  -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl>  Sat, 31 Jan 2004 14:44:55 +0100