[SCM] Debian package checker branch, master, updated. 2.5.10-244-ge954ca1
The following commit has been merged in the master branch:
commit e954ca1c476bdf9f5d456a5ffadb9dd3124e8d63
Author: Niels Thykier <niels@thykier.net>
Date: Sun Nov 18 22:11:40 2012 +0100
c/fields: Fix false-positives caused by whitespace
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/fields b/checks/fields
index c32b207..59882ba 100644
--- a/checks/fields
+++ b/checks/fields
@@ -31,7 +31,7 @@ use Dpkg::Version qw(version_check);
use Lintian::Architecture qw(:all);
use Lintian::Data ();
use Lintian::Check qw(check_maintainer);
-use Lintian::Relation ();
+use Lintian::Relation qw(:constants);
use Lintian::Relation::Version qw(versions_compare);
use Lintian::Tags qw(tag);
use Lintian::Util qw($PKGNAME_REGEX);
@@ -906,12 +906,13 @@ if ($type eq 'source') {
push @arch_dep_pkgs, $binpkg;
}
}
+ my $dstr = join ('|', @arch_dep_pkgs);
+ my $depregex = qr/^(?:$dstr)$/;
foreach (@dbg_pkgs) {
- my $deps;
- $deps = $info->binary_field($_, 'pre-depends', '') . ', ';
- $deps .= $info->binary_field($_, 'depends', '');
+ my $deps = Lintian::Relation->and ($info->binary_relation ($_, 'pre-depends'),
+ $info->binary_relation ($_, 'depends'));
tag 'dbg-package-missing-depends', $_
- unless (grep {my $quoted_name = qr<\Q$_>; $deps =~ m/(?:\s|,|^)$quoted_name(?:\s|,|\z)/} @arch_dep_pkgs);
+ unless $deps->matches ($depregex, VISIT_PRED_NAME);
}
# Check for a python*-dev build dependency in source packages that
diff --git a/debian/changelog b/debian/changelog
index 9baab98..80fdc68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,8 @@ lintian (2.5.11) UNRELEASED; urgency=low
+ [NT] Apply patches from Bernhard R. Link to check for
unintentional whitespace and use of non-cannical URIs in
Vcs-* fields. (Closes: #681769)
+ + [NT] Fix false-positive caused by insignificant whitespace.
+ Thanks to Dima Kogan for the report. (Closes: #693589)
* checks/files:
+ [RG] Recognise smarty3 as smarty itself.
+ [NT] Consider "tasksel tasks" as a meta package.
--
Debian package checker
Reply to: