[SCM] Debian package checker branch, master, updated. 2.5.5-4-g3b079d4

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 3b079d40109b1d1d4754b3e8f4af86ce67a03fb6
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Mar 1 14:58:19 2012 +0100

    cruft: Added missing "unless $ok"
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft b/checks/cruft
index 54f4b4f..fa0eaec 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -175,7 +175,7 @@ for my $file (keys(%$file_info)) {
             }
             close $fd;
         }
-        tag 'source-contains-waf-binary', $file;
+        tag 'source-contains-waf-binary', $file unless $ok;
     }
 }
 
diff --git a/debian/changelog b/debian/changelog
index 379c4f8..9fe866f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 lintian (2.5.6) UNRELEASED; urgency=low
 
+  * checks/cruft:
+    + [NT] Added missing "unless" in the code.  Fixes false
+      positive "source-contains-waf-binary".  Thanks to
+      Dmitrijs Ledkovs for the report.  (Closes: #661561)
   * checks/source-copyright.desc:
     + [NT] Update references for copyright-format checks.  Thanks
       to Thijs Kinkhorst for the report and the patch.
diff --git a/t/tests/cruft-contains-waf/desc b/t/tests/cruft-contains-waf-stripped/desc
similarity index 52%
copy from t/tests/cruft-contains-waf/desc
copy to t/tests/cruft-contains-waf-stripped/desc
index 53d9fce..01b04e7 100644
--- a/t/tests/cruft-contains-waf/desc
+++ b/t/tests/cruft-contains-waf-stripped/desc
@@ -1,6 +1,6 @@
-Testname: cruft-contains-waf
+Testname: cruft-contains-waf-stripped
 Sequence: 6000
 Version: 1.0-1
 Type: non-native
 Description: Check for sources with waf
-Test-For: source-contains-waf-binary
+Test-Against: source-contains-waf-binary
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/cruft-contains-waf-stripped/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/cruft-contains-waf-stripped/tags
diff --git a/t/tests/cruft-contains-waf/upstream/waf.in b/t/tests/cruft-contains-waf-stripped/upstream/waf
similarity index 64%
copy from t/tests/cruft-contains-waf/upstream/waf.in
copy to t/tests/cruft-contains-waf-stripped/upstream/waf
index 1404a57..f057cd8 100644
--- a/t/tests/cruft-contains-waf/upstream/waf.in
+++ b/t/tests/cruft-contains-waf-stripped/upstream/waf
@@ -8,6 +8,8 @@ import os, sys
 if sys.hexversion<0x203000f: raise ImportError("Waf requires python >= 2.3")
   # and we are pretending to be a waf script
 
-# okay, thats enough... below we will include a binary tarball...
-# That is as fun as it sounds (which is to say not a lot).
+# okay, thats enough...
 
+#==>
+# Here one would except to find a tar.bz2 file...
+#<==

-- 
Debian package checker