[SCM] Debian package checker branch, master, updated. 2.5.6-130-g26536e9

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

The following commit has been merged in the master branch:
commit 26536e92b6081dfbada26e678edb57717b64f908
Author: Niels Thykier <niels@thykier.net>
Date:   Sat May 12 23:37:18 2012 +0200

    c/rules: Fix FP "ignores-make-clean error"
    
    Fix misdiagnose of "make -Cdir" as ignoring errors.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/rules b/checks/rules
index cea3ca4..e02d7a6 100644
--- a/checks/rules
+++ b/checks/rules
@@ -188,8 +188,11 @@ while (<RULES>) {
         tag 'debian-rules-uses-pwd', "line $.";
     }
     if (m/^\t\s*-(?:\$[\(\{]MAKE[\}\)]|make)\s.*(?:dist)?clean/s ||
-        m/^\t\s*(?:\$[\(\{]MAKE[\}\)]|make)\s(?:.*\s)?-\w*i.*(?:dist)?clean/s) {
-        tag 'debian-rules-ignores-make-clean-error', "line $.";
+        m/^\t\s*(?:\$[\(\{]MAKE[\}\)]|make)\s(?:.*\s)?-(\w*)i.*(?:dist)?clean/s) {
+        # Ignore "-C<dir>" (#671537)
+        if (not $1 or $1 !~ m,^C,) {
+            tag 'debian-rules-ignores-make-clean-error', "line $.";
+        }
     }
     if (/\$[\(\{]DEB_BUILD_OPTS[\)\}]/) {
         tag 'debian-rules-uses-DEB_BUILD_OPTS', "line $.";
diff --git a/debian/changelog b/debian/changelog
index 50f6caf..492533d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -119,6 +119,10 @@ lintian (2.5.7) UNRELEASED; urgency=low
   * checks/nmu:
     + [NT] Remove Ubuntu specific code to handle their (lack of) NMUs.
       These tags are instead suppressed by the Ubuntu profile.
+  * chekcs/rules:
+    + [NT] Fix false-positive "ignores-make-clean-error" tag caused by
+      using make with -C and a dir containing the letter "i".  Thanks to
+      Tobias Hansen for the report.  (Closes: #671537)
   * checks/scripts{,.desc}:
     + [NT] Mention devref 6.4 in command-with-path-in-maintainer-script.
       Thanks to Arno Töll for the patch.
diff --git a/t/tests/rules-ignores-error-clean-fp/debian/debian/Makefile b/t/tests/rules-ignores-error-clean-fp/debian/debian/Makefile
new file mode 100644
index 0000000..959feb8
--- /dev/null
+++ b/t/tests/rules-ignores-error-clean-fp/debian/debian/Makefile
@@ -0,0 +1,3 @@
+all:
+
+distclean:
diff --git a/t/tests/rules-ignores-error-clean-fp/debian/debian/rules b/t/tests/rules-ignores-error-clean-fp/debian/debian/rules
new file mode 100755
index 0000000..63556d9
--- /dev/null
+++ b/t/tests/rules-ignores-error-clean-fp/debian/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+%:
+	dh $@
+
+override_dh_auto_clean:
+	$(MAKE) -Cdebian distclean
+
+
diff --git a/t/tests/rules-ignores-error-clean-fp/desc b/t/tests/rules-ignores-error-clean-fp/desc
new file mode 100644
index 0000000..ebd0168
--- /dev/null
+++ b/t/tests/rules-ignores-error-clean-fp/desc
@@ -0,0 +1,5 @@
+Testname: rules-ignores-error-clean-fp
+Sequence: 6000
+Version: 1.0
+Description: Check against Lintian false-positive error
+Test-Against: debian-rules-ignores-make-clean-error
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/rules-ignores-error-clean-fp/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/rules-ignores-error-clean-fp/tags
diff --git a/t/tests/rules-ignores-error-clean/debian/Makefile b/t/tests/rules-ignores-error-clean/debian/Makefile
new file mode 100644
index 0000000..959feb8
--- /dev/null
+++ b/t/tests/rules-ignores-error-clean/debian/Makefile
@@ -0,0 +1,3 @@
+all:
+
+distclean:
diff --git a/t/tests/rules-ignores-error-clean/debian/debian/rules b/t/tests/rules-ignores-error-clean/debian/debian/rules
new file mode 100755
index 0000000..b86584f
--- /dev/null
+++ b/t/tests/rules-ignores-error-clean/debian/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+%:
+	dh $@
+
+override_dh_auto_clean:
+	-$(MAKE) distclean
+
+
diff --git a/t/tests/rules-ignores-error-clean/desc b/t/tests/rules-ignores-error-clean/desc
new file mode 100644
index 0000000..922bad0
--- /dev/null
+++ b/t/tests/rules-ignores-error-clean/desc
@@ -0,0 +1,5 @@
+Testname: rules-ignores-error-clean
+Sequence: 6000
+Version: 1.0
+Description: Check for rules ignoring clean error
+Test-For: debian-rules-ignores-make-clean-error
diff --git a/t/tests/rules-ignores-error-clean/tags b/t/tests/rules-ignores-error-clean/tags
new file mode 100644
index 0000000..7903d37
--- /dev/null
+++ b/t/tests/rules-ignores-error-clean/tags
@@ -0,0 +1 @@
+W: rules-ignores-error-clean source: debian-rules-ignores-make-clean-error line 6

-- 
Debian package checker