The following commit has been merged in the master branch: commit 23039b9fd282951be16c78f4021212dfc375bdcd Author: Russ Allbery <r...@debian.org> Date: Sat Mar 20 16:11:00 2010 -0700
Check for a new upstream release without new upstream version * checks/changelog-file{,.desc}: + [RA] New check for a changelog entry indicating a new upstream release but no change in the upstream portion of the package version. Idea from Emilio Pozuelo Monfort. (Closes: #569129) diff --git a/checks/changelog-file b/checks/changelog-file index e2763ce..e3b7508 100644 --- a/checks/changelog-file +++ b/checks/changelog-file @@ -312,6 +312,15 @@ if (@entries) { if $native_pkg and $second_version =~ m/-/; } + my $first_upstream = $first_version; + $first_upstream =~ s/-[^-]+$//; + my $second_upstream = $second_version; + $second_upstream =~ s/-[^-]+$//; + if ($first_upstream eq $second_upstream + and $entries[0]->Changes =~ /^\s*\*\s+new\s+upstream\s+(\S+\s+)?release\b/im) { + tag 'possible-new-upstream-release-without-new-version'; + } + my $first_dist = lc $entries[0]->Distribution; my $second_dist = lc $entries[1]->Distribution; if ($first_dist eq 'unstable' and $second_dist eq 'experimental') { diff --git a/checks/changelog-file.desc b/checks/changelog-file.desc index 166bfa9..f13cf62 100644 --- a/checks/changelog-file.desc +++ b/checks/changelog-file.desc @@ -201,6 +201,16 @@ Info: The latest package has a Debian native version number, while the the maintainer by forgetting to append -1 when uploading a new upstream version. +Tag: possible-new-upstream-release-without-new-version +Severity: normal +Certainty: possible +Info: The most recent changelog entry contains an entry that appears to + say this is a new upstream release (a comment similar to "new upstream + release," possibly with a word between "upstream" and "release"), but the + upstream portion of the package version number didn't change. This may + indicate that the package version was not updated properly in + <tt>debian/changelog</tt>. + Tag: experimental-to-unstable-without-comment Severity: pedantic Certainty: possible diff --git a/debian/changelog b/debian/changelog index 2e3de75..1de7ea5 100755 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ lintian (2.3.4) UNRELEASED; urgency=low + [RA] Exclude packages from the klibc source package from the embedded zlib check since klibc legitimately includes its own copy. Thanks, maximilian attems. (Closes: #573914) + * checks/changelog-file{,.desc}: + + [RA] New check for a changelog entry indicating a new upstream + release but no change in the upstream portion of the package + version. Idea from Emilio Pozuelo Monfort. (Closes: #569129) * checks/control-file: + [RG] Update package-depends-on-hardcoded-libc exception to also exclude eglibc. Based on a patch from Cyril Brulebois. diff --git a/t/tests/changelog-file-new-upstream/debian/debian/changelog.in b/t/tests/changelog-file-new-upstream/debian/debian/changelog.in new file mode 100644 index 0000000..54faf9d --- /dev/null +++ b/t/tests/changelog-file-new-upstream/debian/debian/changelog.in @@ -0,0 +1,14 @@ +{$srcpkg} ({$version}) unstable; urgency=low + + * New upstream bugfix release. + * Lintian Test Suite. + * Test: {$testname} + + -- {$author} {$date} + +{$srcpkg} (1.0-1) unstable; urgency=low + + * Old changelog entry to trigger the tag. + + -- {$author} Sat, 20 Mar 2010 16:09:18 -0700 + diff --git a/t/tests/changelog-file-new-upstream/desc b/t/tests/changelog-file-new-upstream/desc new file mode 100644 index 0000000..3e1a1ad --- /dev/null +++ b/t/tests/changelog-file-new-upstream/desc @@ -0,0 +1,6 @@ +Testname: changelog-file-new-upstream +Sequence: 6000 +Type: non-native +Version: 1.0-2 +Description: Check a new upstream version without a version change +Test-For: possible-new-upstream-release-without-new-version diff --git a/t/tests/changelog-file-new-upstream/tags b/t/tests/changelog-file-new-upstream/tags new file mode 100644 index 0000000..1883933 --- /dev/null +++ b/t/tests/changelog-file-new-upstream/tags @@ -0,0 +1 @@ +W: changelog-file-new-upstream: possible-new-upstream-release-without-new-version diff --git a/t/templates/skel.upstream/.dummy b/t/tests/changelog-file-new-upstream/upstream/.dummy similarity index 100% copy from t/templates/skel.upstream/.dummy copy to t/tests/changelog-file-new-upstream/upstream/.dummy -- Debian package checker -- To UNSUBSCRIBE, email to debian-lint-maint-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1nt7pe-0003ii...@alioth.debian.org