[SCM] Debian package checker branch, master, updated. 2.2.18-56-gf0af67a
The following commit has been merged in the master branch:
commit f0af67a966518e869909e4ee142142e1bfda825e
Author: Russ Allbery <rra@debian.org>
Date: Thu Dec 24 17:10:20 2009 -0800
Allow "See <URL>" to be too long in debian/changelog
* checks/changelog-file:
+ [RA] Also ignore too-long lines that consist of "See" followed by an
unbreakable word. Thanks, Jari Aalto. (Closes: #560005)
Also add some new changelog tests to the test suite.
diff --git a/checks/changelog-file b/checks/changelog-file
index 9c4defd..07b91f7 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -364,7 +364,8 @@ if (@entries) {
# line, so we have to adjust for that in the length check.
my @lines = split ("\n", decode ('utf-8', $changes));
for my $i (0 .. $#lines) {
- if (length ($lines[$i]) > 81 && $lines[$i] !~ /^[\s.o*+-]*\S+$/) {
+ if (length($lines[$i]) > 81
+ and $lines[$i] !~ /^[\s.o*+-]*([Ss]ee:?\s+)?\S+$/) {
tag 'debian-changelog-line-too-long', "line " . ($i + 1);
}
}
diff --git a/debian/changelog b/debian/changelog
index bd743e2..6328b5c 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ lintian (2.3.0) UNRELEASED; urgency=low
+ [RA] Suppress latest-debian-changelog-entry-without-new-date if the
distribution is UNRELEASED. Thanks, Raphaël Hertzog.
(Closes: #560149)
+ + [RA] Also ignore too-long lines that consist of "See" followed by an
+ unbreakable word. Thanks, Jari Aalto. (Closes: #560005)
* checks/control-file{,.desc}:
+ [RA] Check for < and > version dependencies in debian/control since
dpkg-source helpfully rewrites and fixes them in binary packages.
diff --git a/t/COVERAGE b/t/COVERAGE
index e278fd2..3869b60 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -222,21 +222,15 @@ 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-debmake-default-email-address
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-changelog-line-too-long
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 latest-debian-changelog-entry-without-new-date
-changelog-file latest-debian-changelog-entry-without-new-version
-changelog-file possible-missing-colon-in-closes
changelog-file spelling-error-in-news-debian
-changelog-file syntax-error-in-debian-changelog
changelog-file syntax-error-in-debian-news-file
changelog-file wrong-name-for-debian-news-file
@@ -584,7 +578,6 @@ binary
substvar-source-version-is-deprecated
symlink-contains-spurious-segments
symlink-should-be-relative
- syntax-error-in-debian-changelog
syntax-error-in-debian-news-file
unquoted-string-in-menu-item
unstripped-binary-or-object
@@ -592,7 +585,6 @@ binary
cdbs-test
clean-should-be-satisfied-by-build-depends
- debian-changelog-line-too-long
no-human-maintainers
debconf
@@ -639,7 +631,6 @@ debug
debug-file-should-use-detached-symbols
duplicate-entry-in-symbols-control-file
invalid-template-id-in-symbols-file
- latest-debian-changelog-entry-without-new-version
missing-dependency-on-libc
pkg-has-symbols-control-file-but-no-shared-libs
shared-lib-without-dependency-information
@@ -655,7 +646,6 @@ debug
diffs
arch-independent-package-contains-binary-or-object
patch-system-but-direct-changes-in-diff
- possible-missing-colon-in-closes
etcfiles
file-in-etc-not-marked-as-conffile
@@ -712,11 +702,9 @@ filenames
wrong-name-for-debian-news-file
foo++
- debian-changelog-file-contains-debmake-default-email-address
debian-changelog-file-uses-obsolete-national-encoding
debian-control-file-uses-obsolete-national-encoding
debian-watch-file-in-native-package
- latest-debian-changelog-entry-without-new-date
malformed-dm-upload-allowed
uploader-address-is-on-localhost
uploader-address-looks-weird
diff --git a/t/tests/changelog-file-general/debian/debian/changelog.in b/t/tests/changelog-file-general/debian/debian/changelog.in
index 7c8bfd6..42da9c6 100644
--- a/t/tests/changelog-file-general/debian/debian/changelog.in
+++ b/t/tests/changelog-file-general/debian/debian/changelog.in
@@ -2,6 +2,24 @@
* Test: {$testname}
* improbable-bug-number-in-closes (Closes: #12)
+ * Another bug closer without a colon (Closes #555555)
+ * This line is too long since it contains words and words and words but doesn't
+ have any wrapping except at column 81.
+ * http://www.example.com/but-a-really-long-url-does-not-count-as-a-long-line-at-all
+ See http://www.example.com/but-a-really-long-url-does-not-count-as-a-long-line-at-all
+ even if preceded by See.
+
+ -- {$author} {$date}
+
+{$srcpkg} ({$version}) unstable; urgency=low
+
+ * Duplicate changelog entry to trigger tags.
+
+ -- Unknown <unknown@unknown> {$date}
+
+{$srcpkg} () unstable; urgency=low
+
+ * Syntax error here.
-- {$author} {$date}
diff --git a/t/tests/changelog-file-general/desc b/t/tests/changelog-file-general/desc
index 3d381c6..7196c37 100644
--- a/t/tests/changelog-file-general/desc
+++ b/t/tests/changelog-file-general/desc
@@ -5,5 +5,11 @@ Version: 1.0-1
Description: General tests for changelog-file tags
Test-For:
changelog-not-compressed-with-max-compression
+ debian-changelog-file-contains-debmake-default-email-address
debian-changelog-file-contains-obsolete-user-emacs-settings
+ debian-changelog-line-too-long
improbable-bug-number-in-closes
+ latest-debian-changelog-entry-without-new-date
+ latest-debian-changelog-entry-without-new-version
+ possible-missing-colon-in-closes
+ syntax-error-in-debian-changelog
diff --git a/t/tests/changelog-file-general/tags b/t/tests/changelog-file-general/tags
index ac98d3a..33c59c0 100644
--- a/t/tests/changelog-file-general/tags
+++ b/t/tests/changelog-file-general/tags
@@ -1,3 +1,10 @@
+E: changelog-file-general: debian-changelog-file-contains-debmake-default-email-address unknown@unknown
+E: changelog-file-general: possible-missing-colon-in-closes Closes #555555
W: changelog-file-general: changelog-not-compressed-with-max-compression changelog.Debian.gz
W: changelog-file-general: debian-changelog-file-contains-obsolete-user-emacs-settings
+W: changelog-file-general: debian-changelog-line-too-long line 4
W: changelog-file-general: improbable-bug-number-in-closes 12
+W: changelog-file-general: latest-debian-changelog-entry-without-new-date
+W: changelog-file-general: latest-debian-changelog-entry-without-new-version
+W: changelog-file-general: syntax-error-in-debian-changelog line 20 "badly formatted heading line"
+W: changelog-file-general: syntax-error-in-debian-changelog line 22 "found change data where expected next heading or eof"
--
Debian package checker
Reply to: