[SCM] Debian package checker branch, master, updated. 1.24.4-110-g461090e
The following commit has been merged in the master branch:
commit e1febcead7c9437e2c2486bacbf273a09e484f79
Author: Frank Lichtenheld <djpig@debian.org>
Date: Fri Sep 12 00:08:16 2008 +0200
checks/fields: Check Enhances together with the other relational fields
diff --git a/checks/fields b/checks/fields
index 9b26ed6..045b51c 100644
--- a/checks/fields
+++ b/checks/fields
@@ -418,7 +418,7 @@ if (($type eq "binary") || ($type eq 'udeb')) {
$debugpackage = 1;
$debugbase = $1;
}
- for my $field (qw(depends pre-depends recommends suggests conflicts provides replaces breaks)) {
+ for my $field (qw(depends pre-depends recommends suggests conflicts provides enhances replaces breaks)) {
if (defined $info->field($field)) {
#Get data and clean it
my $data = $info->field($field);;
diff --git a/debian/changelog b/debian/changelog
index 7fe536d..6b94c66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ lintian (2.0.0~rc1) experimental; urgency=low
fields if the package is part of an "ORed group" of packages and is
not listed first. As with Depends, an info tag will still be issued
for such packages. (Closes: #496875)
+ + [FL] Check Enhances together with the other relational fields.
* checks/files{,.desc}:
+ [RA,FL] Patches from Raphael Geissert:
- Check for embedding copies of jsjac and jsMath.
diff --git a/testset/relations/debian/control b/testset/relations/debian/control
index a33df41..8ed5f4d 100644
--- a/testset/relations/debian/control
+++ b/testset/relations/debian/control
@@ -36,6 +36,7 @@ Architecture: all
Section: non-free/misc
Depends: libstdc++2.10, libstdc++2.10-glibc2.2, libstdc++3.0, tk8.2, tk8.3, tcl8.0, tcl8.2, tkx8.2, tkx8.3, tclx8.2, libpng2, libpng3, xorg, ${shlibs:Depends}, makedev | udev
Provides: awk
+Enhances: foo | baz
Recommends: ${shlibs:Depends}, relations-multiple-libs, gs | gs-gpl, makedev
Breaks: libpng3 (<< 1.0), libpng2
Suggests: x-dev, ghostscript | gs
diff --git a/testset/tags.relations b/testset/tags.relations
index 9f127f4..972a3c2 100644
--- a/testset/tags.relations
+++ b/testset/tags.relations
@@ -9,6 +9,7 @@ E: relations source: depends-on-build-essential-package-without-using-version ma
E: relations source: invalid-arch-string-in-source-relation test [build-conflicts: bar [alpha test]]
E: relations source: missing-build-dependency libmodule-build-perl
E: relations source: section-category-mismatch Package relations-multiple-libs
+E: relations-multiple-libs: alternates-not-allowed enhances
E: relations-multiple-libs: conflicts-with-dependency depends libpng2
E: relations-multiple-libs: depends-on-obsolete-package recommends: gs
E: relations-multiple-libs: depends-on-obsolete-package recommends: gs-gpl
--
Debian package checker
Reply to: