[SCM] Debian package checker branch, master, updated. 2.2.14-16-g6365ed6
The following commit has been merged in the master branch:
commit 6365ed6d95eb29a1a7606c69cd50f6dcbf015dbd
Author: Russ Allbery <rra@debian.org>
Date: Sat Sep 12 18:16:24 2009 -0700
Ignore whitespace in debian/compat
* checks/debhelper:
+ [RA] Ignore whitespace when checking debian/compat, since Perl will
when converting it to a number. Thanks, Niels Thykier.
(Closes: #545430)
diff --git a/checks/debhelper b/checks/debhelper
index d6f7e17..188e438 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -208,7 +208,8 @@ if (-f 'debfiles/compat') {
($compat) = split(/\n/, $compat_file);
$compat =~ s/^\s+$//;
if ($compat) {
- chomp $compat;
+ $compat =~ s/^\s+//;
+ $compat =~ s/\s+$//;
if ($compat !~ m/^\d+$/) {
tag 'debhelper-compat-not-a-number', $compat;
$compat =~ s/[^\d]//g;
diff --git a/debian/changelog b/debian/changelog
index b99c055..b7609d5 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ lintian (2.2.15) UNRELEASED; urgency=low
+ [RA] Moved the essential package list to data/fields.
* checks/copyright-file:
+ [RA] Use Lintian::Data to read the essential package list.
+ * checks/debhelper:
+ + [RA] Ignore whitespace when checking debian/compat, since Perl will
+ when converting it to a number. Thanks, Niels Thykier.
+ (Closes: #545430)
* checks/fields:
+ [RA] Exclude base-files from the needlesly-depends-on-awk tag
and from the warning about depending on a virtual package without
diff --git a/t/tests/debhelper-compat-whitespace/debian/debian/compat b/t/tests/debhelper-compat-whitespace/debian/debian/compat
new file mode 100644
index 0000000..b8ab780
--- /dev/null
+++ b/t/tests/debhelper-compat-whitespace/debian/debian/compat
@@ -0,0 +1 @@
+ 7
diff --git a/t/tests/debhelper-compat-whitespace/desc b/t/tests/debhelper-compat-whitespace/desc
new file mode 100644
index 0000000..6326c40
--- /dev/null
+++ b/t/tests/debhelper-compat-whitespace/desc
@@ -0,0 +1,5 @@
+Testname: debhelper-compat-whitespace
+Sequence: 6000
+Version: 1.0
+Description: Allow whitespace in debian/compat
+Test-Against: debhelper-compat-not-a-number
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/debhelper-compat-whitespace/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/debhelper-compat-whitespace/tags
--
Debian package checker
Reply to: