[SCM] Debian package checker branch, master, updated. 2.3.0-51-gb8c935d
The following commit has been merged in the master branch:
commit c1a8d3490aacb94d6f3cff5fa911142761b18254
Author: Russ Allbery <rra@debian.org>
Date: Fri Jan 1 21:03:32 2010 -0800
Check for NEWS.Debian files using asterisks for formatting
* checks/changelog-file{,.desc}:
+ [RA] Per devref, recommend against NEWS.Debian entries formatted
with asterisks like changelog entries.
diff --git a/checks/changelog-file b/checks/changelog-file
index 07b91f7..cfa8991 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -139,10 +139,8 @@ if ($#doc_files < 0) {
return 0;
}
-# Check a NEWS.Debian file if we have one. We should additionally check here
-# that the entries don't begin with an asterisk, but that hasn't been done
-# yet. Save the version, distribution, and urgency for later checks against
-# the changelog file.
+# Check a NEWS.Debian file if we have one. Save the version, distribution,
+# and urgency for later checks against the changelog file.
my $news;
if (-f 'NEWS.Debian') {
my $line = file_is_encoded_in_non_utf8('NEWS.Debian', $type, $pkg);
@@ -163,6 +161,9 @@ if (-f 'NEWS.Debian') {
tag "debian-news-entry-has-strange-distribution", $news->Distribution;
}
spelling_check('spelling-error-in-news-debian', $news->Changes);
+ if ($news->Changes =~ /^\s*\*\s/) {
+ tag 'debian-news-entry-uses-asterisk';
+ }
}
}
diff --git a/checks/changelog-file.desc b/checks/changelog-file.desc
index 406e2c3..1891df7 100644
--- a/checks/changelog-file.desc
+++ b/checks/changelog-file.desc
@@ -260,6 +260,15 @@ Info: The latest entry in NEWS.Debian has an unusual distribution name.
distribution doesn't match the distribution for the same entry in the
Debian changelog file.
+Tag: debian-news-entry-uses-asterisk
+Severity: wishlist
+Certainty: possible
+Info: The latest entry in NEWS.Debian appears to use asterisks to present
+ changes in a bulleted list, similar to the normal changelog syntax. The
+ Debian Developer's Reference recommends using regular paragraphs in
+ NEWS.Debian rather than a bulleted list.
+Ref: devref 6.3.4
+
Tag: spelling-error-in-changelog
Severity: minor
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 925664f..a34310d 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ lintian (2.3.1) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
- init.d-script-missing-start
+ - debian-news-entry-uses-asterisk
- non-native-package-with-native-version
* {checks,collection}/*.desc:
@@ -12,6 +13,9 @@ lintian (2.3.1) UNRELEASED; urgency=low
+ [RG] Recognise hppa64 binaries and ignore them on the
binary-from-other-architecture check for hppa.
Thanks, Matthias Klose. (Closes: #562788)
+ * checks/changelog-file{,.desc}:
+ + [RA] Per devref, recommend against NEWS.Debian entries formatted
+ with asterisks like changelog entries.
* checks/cruft:
+ [RA] Fix the regex to properly ignore CMakeCache.txt in the debian
directory. Thanks, Aaron M. Ucko. (Closes: #553264)
diff --git a/t/COVERAGE b/t/COVERAGE
index 01aa7c2..fa76dc7 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -216,17 +216,12 @@ binaries unstripped-binary-or-object
changelog-file changelog-file-missing-in-native-package
changelog-file changelog-file-not-compressed
-changelog-file changelog-news-debian-mismatch
changelog-file debian-changelog-file-contains-invalid-email-address
changelog-file debian-changelog-file-is-a-symlink
changelog-file debian-changelog-file-missing
changelog-file debian-changelog-file-missing-or-wrong-name
changelog-file debian-changelog-file-uses-obsolete-national-encoding
-changelog-file debian-news-entry-has-strange-distribution
changelog-file debian-news-file-not-compressed
-changelog-file debian-news-file-uses-obsolete-national-encoding
-changelog-file spelling-error-in-news-debian
-changelog-file syntax-error-in-debian-news-file
changelog-file wrong-name-for-debian-news-file
control-file debian-control-file-uses-obsolete-national-encoding
@@ -505,11 +500,8 @@ Breakdown of remaining tags in legacy test suite by test case:
binary
binary-has-unneeded-section
changelog-file-not-compressed
- changelog-news-debian-mismatch
control-file-is-empty
debian-changelog-file-missing-or-wrong-name
- debian-news-entry-has-strange-distribution
- debian-news-file-uses-obsolete-national-encoding
deprecated-kdelnk-file
desktop-contains-deprecated-header
desktop-entry-missing-required-key
@@ -553,7 +545,6 @@ binary
postrm-does-not-call-updatemenus
spelling-error-in-doc-base-abstract-field
spelling-error-in-doc-base-title-field
- spelling-error-in-news-debian
statically-linked-binary
su-to-root-with-usr-sbin
su-wrapper-not-su-to-root
@@ -561,7 +552,6 @@ binary
substvar-source-version-is-deprecated
symlink-contains-spurious-segments
symlink-should-be-relative
- syntax-error-in-debian-news-file
unquoted-string-in-menu-item
unstripped-binary-or-object
xs-vcs-header-in-debian-control
diff --git a/t/tests/changelog-file-news-general/debian/debian/NEWS b/t/tests/changelog-file-news-general/debian/debian/NEWS
new file mode 100644
index 0000000..8994cdf
--- /dev/null
+++ b/t/tests/changelog-file-news-general/debian/debian/NEWS
@@ -0,0 +1,12 @@
+changelog-file-news-general (1.0) UNRELEASED; urgency=high
+
+ * This is a major change, which shouldn't be using an asterisk. It also
+ has an ISO 8859-1 character: � and a speling error.
+
+ -- Russ Allbery <rra@debian.org> Fri, 01 Jan 2010 20:57:15 -0800
+
+changelog-file-news-general (0.9) unstable; urgency=low
+
+ Another entry, this one with a syntax error in the date.
+
+ -- Russ Allbery <rra@debian.org> Fri, 01 Jan 2010 20:57:15 -080
diff --git a/t/tests/changelog-file-news-general/desc b/t/tests/changelog-file-news-general/desc
new file mode 100644
index 0000000..e946f28
--- /dev/null
+++ b/t/tests/changelog-file-news-general/desc
@@ -0,0 +1,11 @@
+Testname: changelog-file-news-general
+Sequence: 6000
+Version: 1.0
+Description: General checks for NEWS.Debian
+Test-For:
+ changelog-news-debian-mismatch
+ debian-news-entry-has-strange-distribution
+ debian-news-entry-uses-asterisk
+ 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
new file mode 100644
index 0000000..cc3de1f
--- /dev/null
+++ b/t/tests/changelog-file-news-general/tags
@@ -0,0 +1,8 @@
+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
+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
+W: changelog-file-news-general: spelling-error-in-news-debian speling spelling
+W: changelog-file-news-general: syntax-error-in-debian-news-file line 12 "badly formatted trailer line"
+W: changelog-file-news-general: syntax-error-in-debian-news-file line 12 "found eof where expected more change data or trailer"
--
Debian package checker
Reply to: