[SCM] Debian package checker branch, master, updated. 2.3.1-5-g015b582
The following commit has been merged in the master branch:
commit 015b58286c92871d1454b6996908cc9b6c64c3e9
Author: Russ Allbery <rra@debian.org>
Date: Sun Jan 3 14:33:56 2010 -0800
Avoid Perl warning when checking NEWS for a trailing blank line
* checks/changelog-file:
+ [RA] Avoid Perl warning when the NEWS file ends immediately after
the most recent entry. (Closes: #563585)
diff --git a/checks/changelog-file b/checks/changelog-file
index b88f09e..e2763ce 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -176,8 +176,8 @@ if (-f 'NEWS.Debian') {
last if /^ --/;
}
my $next = <IN>;
- tag 'debian-news-entry-without-blank-line', "line " . ($. - 1)
- unless $next =~ /^\s*$/;
+ tag 'debian-news-entry-without-blank-line', "line $."
+ unless ($next and $next =~ /^\s*$/);
close IN;
}
diff --git a/debian/changelog b/debian/changelog
index b1f9b22..77a4eef 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
lintian (2.3.2) UNRELEASED; urgency=low
+ * checks/changelog-file:
+ + [RA] Avoid Perl warning when the NEWS file ends immediately after
+ the most recent entry. (Closes: #563585)
* checks/copyright-file:
+ [RA] Relax the regex for matching dh-make-perl boilerplate to catch
the current text. Thanks, gregor herrmann. (Closes: #563571)
diff --git a/t/tests/changelog-file-news-general/tags b/t/tests/changelog-file-news-general/tags
index 337db7a..503e2be 100644
--- a/t/tests/changelog-file-news-general/tags
+++ b/t/tests/changelog-file-news-general/tags
@@ -1,6 +1,6 @@
E: changelog-file-news-general: debian-news-file-uses-obsolete-national-encoding at line 4
I: changelog-file-news-general: debian-news-entry-uses-asterisk
-I: changelog-file-news-general: debian-news-entry-without-blank-line line 6
+I: changelog-file-news-general: debian-news-entry-without-blank-line line 7
W: changelog-file-news-general: changelog-news-debian-mismatch distribution unstable != UNRELEASED
W: changelog-file-news-general: changelog-news-debian-mismatch urgency low != high
W: changelog-file-news-general: debian-news-entry-has-strange-distribution UNRELEASED
--
Debian package checker
Reply to: