[SCM] Debian package checker branch, master, updated. 2.4.3-233-g20da3dc
The following commit has been merged in the master branch:
commit 20da3dc6f44732ca6dc27f1a0ea72629d728f6bf
Author: Raphael Geissert <atomo64@gmail.com>
Date: Mon Feb 14 10:39:50 2011 -0600
Correctly handle include directives preceded by a tab
* checks/rules:
+ [RG] Correctly handle include directives preceded by a tab.
(Closes: #607281)
diff --git a/checks/rules b/checks/rules
index 61bc175..cf0d210 100644
--- a/checks/rules
+++ b/checks/rules
@@ -150,7 +150,7 @@ my $maybe_skipping;
my $uses_makefile_pl = 0;
while (<RULES>) {
next if /^\s*\#/;
- $includes = 1 if m/^ *[s-]?include\s+/;
+ $includes = 1 if m/^\s*[s-]?include\s+/;
$uses_makefile_pl = 1 if m/Makefile\.PL/;
# Check for DH_COMPAT settings outside of any rule, which are now
diff --git a/debian/changelog b/debian/changelog
index 89fa0dc..7f9f34c 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -136,6 +136,8 @@ lintian (2.5.0) UNRELEASED; urgency=low
+ [RG] Drop some checks for versioned dependencies that can now be
satisfied in stable (squeeze). Thanks, Cyril Brulebois.
(Closes: #612137)
+ + [RG] Correctly handle include directives preceded by a tab.
+ (Closes: #607281)
* checks/scripts:
+ [NT] Added mscgen as interpreter.
* checks/standards-version:
diff --git a/t/tests/rules-missing-targets-with-includes/debian/debian/rules b/t/tests/rules-missing-targets-with-includes/debian/debian/rules
new file mode 100755
index 0000000..512e7e1
--- /dev/null
+++ b/t/tests/rules-missing-targets-with-includes/debian/debian/rules
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+
+ include debian/rules.mk
diff --git a/t/tests/rules-missing-targets-with-includes/debian/debian/rules.mk b/t/tests/rules-missing-targets-with-includes/debian/debian/rules.mk
new file mode 100644
index 0000000..4e68614
--- /dev/null
+++ b/t/tests/rules-missing-targets-with-includes/debian/debian/rules.mk
@@ -0,0 +1,2 @@
+%:
+ dh $@
diff --git a/t/tests/rules-missing-targets-with-includes/desc b/t/tests/rules-missing-targets-with-includes/desc
new file mode 100644
index 0000000..24614f4
--- /dev/null
+++ b/t/tests/rules-missing-targets-with-includes/desc
@@ -0,0 +1,7 @@
+Testname: rules-missing-targets-with-includes
+Sequence: 6000
+Version: 1.0
+Description: Test for debian/rules with targets implemented in included
+ file.
+Test-Against: debian-rules-missing-required-target
+References: Debian Bug#607281
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/rules-missing-targets-with-includes/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/rules-missing-targets-with-includes/tags
--
Debian package checker
Reply to: