[lintian] 02/02: checks/cruft.pm: Fix version parsing for native packages.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit ddd9095056f649718414ce6a7db20949ef65d1ac
Author: Felix Lechner <felix.lechner@lease-up.com>
Date: Sun Dec 31 23:00:40 2017 -0800
checks/cruft.pm: Fix version parsing for native packages.
Signed-off-by: Chris Lamb <lamby@debian.org>
---
checks/cruft.pm | 2 +-
debian/changelog | 1 +
t/tests/legacy-filenames/tags | 1 +
t/tests/legacy-maintainer-scripts/tags | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/checks/cruft.pm b/checks/cruft.pm
index 3007a68..f1790a3 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -346,7 +346,7 @@ sub run {
my $version = $info->field('version', '0-1');
if ($info->native) {
- if ($version =~ /-/ and $version !~ /-0\.[^-]+$/) {
+ if ($version =~ /-/) {
tag 'native-package-with-dash-version';
}
}else {
diff --git a/debian/changelog b/debian/changelog
index fb8897d..36178fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ lintian (2.5.68) UNRELEASED; urgency=medium
+ [CL] Avoid a false-positive reported by Theppitak Karoonboonyanan
when matching autotools-pkg-config-macro-not-cross-compilation-safe
by skipping comment lines. (Closes: #886297)
+ + [FL] Fix version parsing for native packages.
* checks/debconf.pm:
+ [CL] Don't warn about unknown template type "entropy" when a package
depends on cdebconf. (Closes: #677870)
diff --git a/t/tests/legacy-filenames/tags b/t/tests/legacy-filenames/tags
index cf03f75..c842a88 100644
--- a/t/tests/legacy-filenames/tags
+++ b/t/tests/legacy-filenames/tags
@@ -63,6 +63,7 @@ W: filenames source: diff-contains-svk-commit-file data/svk-commitsEr9P.tmp
W: filenames source: diff-contains-svn-commit-file data/svn-commit.tmp
W: filenames source: diff-contains-svn-conflict-file data/Maelstrom Sounce.r121
W: filenames source: diff-contains-svn-control-dir .svn
+W: filenames source: native-package-with-dash-version
W: filenames source: no-section-field-for-source
W: filenames: bad-permissions-for-ali-file usr/lib/ada/adalib/test.ali
W: filenames: binary-without-manpage usr/bin/X11/testxbin
diff --git a/t/tests/legacy-maintainer-scripts/tags b/t/tests/legacy-maintainer-scripts/tags
index 14c993c..b3c067e 100644
--- a/t/tests/legacy-maintainer-scripts/tags
+++ b/t/tests/legacy-maintainer-scripts/tags
@@ -49,6 +49,7 @@ W: maintainer-scripts source: debian-watch-file-should-mangle-version line 7
W: maintainer-scripts source: debian-watch-file-unknown-version 5
W: maintainer-scripts source: dfsg-version-in-native-package 7+dfsg-0.1
W: maintainer-scripts source: dm-upload-allowed-is-obsolete
+W: maintainer-scripts source: native-package-with-dash-version
W: maintainer-scripts source: qa-upload-has-incorrect-version-number 7+dfsg-0.1
W: maintainer-scripts: command-with-path-in-maintainer-script postinst:172 /usr/bin/baz
W: maintainer-scripts: command-with-path-in-maintainer-script preinst:12 /bin/egrep
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: