From: Thadeu Lima de Souza Cascardo <casca...@debian.org>
---
checks/source-changelog.pm | 4 ++--
debian/changelog | 3 +++
.../nmu-new-upstream-version/debian/debian/changelog.in | 7 +++++++
t/tests/nmu-new-upstream-version/desc | 6 ++++++
t/tests/nmu-new-upstream-version/tags | 0
5 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 t/tests/nmu-new-upstream-version/debian/debian/changelog.in
create mode 100644 t/tests/nmu-new-upstream-version/desc
create mode 100644 t/tests/nmu-new-upstream-version/tags
diff --git a/checks/source-changelog.pm b/checks/source-changelog.pm
index 2e6c43ecd..c88618ed7 100644
--- a/checks/source-changelog.pm
+++ b/checks/source-changelog.pm
@@ -63,7 +63,7 @@ sub parse_version {
$revision = "+nmu$source_nmu" if $native && $source_nmu;
$revision = "-$debian" . ($source_nmu ? ".$source_nmu" : '')
- if !$native && $debian;
+ if !$native && defined($debian);
my $reconstructed
= ($epoch ? "$epoch:" : '')
@@ -107,7 +107,7 @@ sub run {
tag 'debian-changelog-version-requires-debian-revision',
$latest_version->{Literal}
- unless $latest_version->{Debian} || $info->native;
+ unless defined($latest_version->{Debian}) || $info->native;
}
if (@entries > 1) {
diff --git a/debian/changelog b/debian/changelog
index b0afe4219..37d706d1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lintian (2.5.98) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * checks/source-changelog.pm:
+ + [TC] Allow debian revision 0, used on new upstream NMUs.
+
* checks/scripts.desc:
+ [CL] Expand the description to explain why we emit
wrong-path-for-interpreter for #!/usr/bin/env perl.
diff --git a/t/tests/nmu-new-upstream-version/debian/debian/changelog.in
b/t/tests/nmu-new-upstream-version/debian/debian/changelog.in
new file mode 100644
index 000000000..ee4b8d0fe
--- /dev/null
+++ b/t/tests/nmu-new-upstream-version/debian/debian/changelog.in
@@ -0,0 +1,7 @@
+{$source} ({$version}) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Lintian Test Suite.
+ * Test: {$testname}
+
+ -- Thadeu Lima de Souza Cascardo <casca...@debian.org> {$date}
diff --git a/t/tests/nmu-new-upstream-version/desc
b/t/tests/nmu-new-upstream-version/desc
new file mode 100644
index 000000000..6e4282580
--- /dev/null
+++ b/t/tests/nmu-new-upstream-version/desc
@@ -0,0 +1,6 @@
+Testname: nmu-new-upstream-version
+Version: 3.1-0.1
+Description: Test for new upstream NMU versions
+Type: non-native
+Test-Against:
+ malformed-debian-changelog-version
diff --git a/t/tests/nmu-new-upstream-version/tags
b/t/tests/nmu-new-upstream-version/tags
new file mode 100644
index 000000000..e69de29bb
--
2.18.0
