[SCM] Debian package checker branch, master, updated. 2.4.2-22-g8d5bfe8
The following commit has been merged in the master branch:
commit 1a64f1aa30073735722e718c9ca881e92b32dc69
Author: Russ Allbery <rra@debian.org>
Date: Sun Jul 25 15:45:00 2010 -0700
Drop check for NEWS ending in a trailing blank line
* checks/changelog-file{,.desc}:
+ [RA] apt-listchanges has been fixed, so drop the check for NEWS
files ending in a trailing blank line. (Closes: #586816)
diff --git a/checks/changelog-file b/checks/changelog-file
index eaf5d71..8147095 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -165,20 +165,6 @@ if (-f 'NEWS.Debian') {
tag 'debian-news-entry-uses-asterisk';
}
}
-
- # Check that the most recent trailer line in NEWS.Debian is followed by a
- # blank line due to a current bug in apt-listchanges that otherwise
- # doesn't show a blank line between entries from other packages.
- open(IN, '<', 'NEWS.Debian')
- or fail("cannot open NEWS.Debian for $type package $pkg");
- local $_;
- while (<IN>) {
- last if /^ --/;
- }
- my $next = <IN>;
- tag 'debian-news-entry-without-blank-line', "line $."
- unless ($next and $next =~ /^\s*$/);
- close IN;
}
if ( $found_html && !$found_text ) {
diff --git a/checks/changelog-file.desc b/checks/changelog-file.desc
index f13cf62..3c585fa 100644
--- a/checks/changelog-file.desc
+++ b/checks/changelog-file.desc
@@ -279,20 +279,6 @@ Info: The latest entry in NEWS.Debian appears to use asterisks to present
NEWS.Debian rather than a bulleted list.
Ref: devref 6.3.4
-Tag: debian-news-entry-without-blank-line
-Severity: minor
-Certainty: possible
-Info: There appears to be no blank line after the most recent
- <tt>NEWS.Debian</tt> entry.
- .
- The current <tt>apt-listchanges</tt> takes the blank that separates
- entries for different packages from the blank line following the trailer
- line of each <tt>NEWS.Debian</tt> file. This means that unless there is
- a blank line after an entry, it may be displayed to the user without a
- blank line between it and entries from other packages. Please add a
- blank line (which, if this is the only entry in the file, may mean adding
- a trailing blank line).
-
Tag: debian-news-entry-has-unknown-version
Severity: normal
Certainty: possible
diff --git a/debian/changelog b/debian/changelog
index 2c6fcc2..61ebcc0 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,16 @@ lintian (2.4.3) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
- embedded-library
+ + Removed:
+ - debian-news-entry-without-blank-line
* checks/binaries{,.desc}:
+ [RG] Detect embedded copies of expat, libbz2, libmagic, libxml2,
pcre3, and tiff.
+ [RG] Recognise powerpcspe and sh4 ELF objects.
+ * checks/changelog-file{,.desc}:
+ + [RA] apt-listchanges has been fixed, so drop the check for NEWS
+ files ending in a trailing blank line. (Closes: #586816)
* checks/files
+ [RG] Detect embedded copies of HTMLPurifier.
+ [RG] Detect embedded copies of the Strophe javascript library.
diff --git a/t/tests/changelog-file-news-general/desc b/t/tests/changelog-file-news-general/desc
index 305883f..e946f28 100644
--- a/t/tests/changelog-file-news-general/desc
+++ b/t/tests/changelog-file-news-general/desc
@@ -6,7 +6,6 @@ Test-For:
changelog-news-debian-mismatch
debian-news-entry-has-strange-distribution
debian-news-entry-uses-asterisk
- debian-news-entry-without-blank-line
debian-news-file-uses-obsolete-national-encoding
spelling-error-in-news-debian
syntax-error-in-debian-news-file
diff --git a/t/tests/changelog-file-news-general/tags b/t/tests/changelog-file-news-general/tags
index 503e2be..e02d132 100644
--- a/t/tests/changelog-file-news-general/tags
+++ b/t/tests/changelog-file-news-general/tags
@@ -1,6 +1,5 @@
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 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: