[lintian] 01/02: checks/changelog-file.pm: Fix version parsing for hyphen in upstream versions.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit f3f373e5365a58d7ee3b126b8f1dfbda557d02a4
Author: Felix Lechner <felix.lechner@lease-up.com>
Date: Sun Dec 31 16:19:42 2017 -0800
checks/changelog-file.pm: Fix version parsing for hyphen in upstream versions.
Signed-off-by: Chris Lamb <lamby@debian.org>
---
checks/changelog-file.pm | 8 ++++----
debian/changelog | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/checks/changelog-file.pm b/checks/changelog-file.pm
index 62838b0..fda5d8f 100644
--- a/checks/changelog-file.pm
+++ b/checks/changelog-file.pm
@@ -328,10 +328,10 @@ sub run {
$first_upstream =~ s/-[^-]+$//;
my $second_upstream = $second_version;
$second_upstream =~ s/-[^-]+$//;
- my $first_debian = $first_version;
- $first_debian =~ s/^[^-]+-//;
- my $second_debian = $second_version;
- $second_debian =~ s/^[^-]+-//;
+ my $first_debian =substr $first_version, length($first_upstream);
+ $first_debian =~ s/-([^-]+)$/$1/ if length($first_debian) > 0;
+ my $second_debian =substr $second_version,length($second_upstream);
+ $second_debian =~ s/-([^-]+)$/$1/ if length($second_debian) > 0;
if ($first_upstream eq $second_upstream) {
if ($entries[0]->Changes
diff --git a/debian/changelog b/debian/changelog
index b1317e1..fb8897d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ lintian (2.5.68) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * checks/changelog-file.pm:
+ + [FL] Fix version parsing for hyphen in upstream versions.
* checks/cruft.pm:
+ [CL] Avoid a false-positive reported by Theppitak Karoonboonyanan
when matching autotools-pkg-config-macro-not-cross-compilation-safe
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: