[SCM] Debian package checker branch, master, updated. 2.2.16-3-g2c62862
The following commit has been merged in the master branch:
commit 458325cd2ebcfb5bd9a3f4bb7ce8aea9db65f9d7
Author: Russ Allbery <rra@debian.org>
Date: Tue Sep 22 10:07:28 2009 -0700
Correctly handle dependencies on -dev packages containing a version
* checks/control-file:
+ [RA] Correctly exclude lib*-dev dependencies on other lib*-dev
packages that contain a version number. Thanks, Yves-Alexis Perez.
(Closes: #547773)
diff --git a/checks/control-file b/checks/control-file
index a95f8bb..c7cfbc2 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -214,7 +214,7 @@ for my $binary_control (@binary_controls) {
for my $depend (split /\s*,\s*/, $binary_control->{'depends'}) {
my ($target, $version) = ($depend =~ /^([\w.+-]+)(?:\s*\(([^\)]+)\))?/);
next unless $target;
- if ($target =~ /^lib[\w.+-]+\d/ and grep { $target eq $_ } @package_names) {
+ if ($target =~ /^lib[\w.+-]+\d/ and $target !~ /-dev$/ and grep { $target eq $_ } @package_names) {
tag 'weak-library-dev-dependency', "$package on $depend"
unless ($version and $version =~ /^\s*=\s*\$\{(?:binary:Version|Source-Version)\}/);
}
diff --git a/debian/changelog b/debian/changelog
index d326663..3dfe48d 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lintian (2.2.17) UNRELEASED; urgency=low
+
+ * checks/control-file:
+ + [RA] Correctly exclude lib*-dev dependencies on other lib*-dev
+ packages that contain a version number. Thanks, Yves-Alexis Perez.
+ (Closes: #547773)
+
+ -- Russ Allbery <rra@debian.org> Tue, 22 Sep 2009 10:07:24 -0700
+
lintian (2.2.16) unstable; urgency=low
* Summary of tag changes:
diff --git a/t/tests/control-file-library-dev/debian/debian/control.in b/t/tests/control-file-library-dev/debian/debian/control.in
index 8ff5b50..5c0ca7d 100644
--- a/t/tests/control-file-library-dev/debian/debian/control.in
+++ b/t/tests/control-file-library-dev/debian/debian/control.in
@@ -31,7 +31,7 @@ Architecture: {$architecture}
Depends: $\{shlibs:Depends\}, $\{misc:Depends\},
libcontrol-file-foo1 (= $\{binary:Version\}),
libcontrol-file-bar7ldbl, libcontrol-file-baz9-4 (>= $\{binary:Version\}),
- libfoo4, libcontrol-file-doc
+ libfoo4, libcontrol-file-doc, libcontrol-file4-dev
Description: {$description} (dev package)
Dev package.
.
@@ -59,3 +59,14 @@ Description: {$description} (doc package)
This is a test package designed to exercise some feature or tag of
Lintian. It is part of the Lintian test suite and may do very odd
things. It should not be installed like a regular package.
+
+Package: libcontrol-file4-dev
+Section: libdevel
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (dev package with version)
+ Dev package containing a number.
+ .
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package.
--
Debian package checker
Reply to: