lintian: r843 - in trunk: checks debian
Author: rra
Date: 2007-04-11 05:13:49 +0200 (Wed, 11 Apr 2007)
New Revision: 843
Modified:
trunk/checks/debconf
trunk/debian/changelog
Log:
* checks/debconf:
+ [RA] Rather than munging dependencies to cope with the various
implementations of debconf, take advantage of our new dependency
comparison routines and check the full correct dependency. This
should really fix problems with checking the dependencies for
settitle. Patch from Damyan Ivanov. (Closes: #349616)
Modified: trunk/checks/debconf
===================================================================
--- trunk/checks/debconf 2007-04-11 02:59:33 UTC (rev 842)
+++ trunk/checks/debconf 2007-04-11 03:13:49 UTC (rev 843)
@@ -59,6 +59,11 @@
my %valid_priorities = map { $_ => 1 }
qw(low medium high critical);
+# All the packages that provide debconf functionality. Anything using debconf
+# needs to have dependencies that satisfy one of these.
+my @debconfs = qw(debconf debconf-2.0 cdebconf cdebconf-udeb libdebconfclient0
+ libdebconfclient0-udeb);
+
my $seenconfig='';
my $seentemplates='';
my $usespreinst='';
@@ -107,16 +112,10 @@
chomp($_ = <IN>);
close IN;
$_ .= ", $version" if defined $version;
- $_ =~ s/debconf-2\.0/debconf (>= 1.2.30)/go;
- $_ =~ s/cdebconf(-\w+)?(-udeb)?\s*(\(.+?\))?/debconf (>= 1.2.30)/g;
- $_ =~ s/libdebconfclient.?(-udeb)?\s*(\(.+?\))?/debconf (>= 1.2.30)/g;
push @alldeps, $_;
$dependencies{$field} = Dep::parse($_);
} else {
my $dep = $version;
- $dep =~ s/debconf-2\.0/debconf (>= 1.2.30)/go;
- $dep =~ s/cdebconf(-\w+)?(-udeb)?\s*(\(.+?\))?/debconf (>= 1.2.30)/g;
- $dep =~ s/libdebconfclient.?(-udeb)?\s*(\(.+?\))?/debconf (>= 1.2.30)/g;
push @alldeps, $dep;
$dependencies{$field} = Dep::parse($dep);
}
@@ -398,9 +397,8 @@
$isdefault=1;
}
if (not $usessettitle and m/db_settitle\s+/) {
- unless (Dep::implies($alldependencies,
- Dep::parse('debconf (>= 1.3.22)'))) {
- tag "settitle-requires-versioned-depends", "$file"
+ unless (Dep::implies($alldependencies, Dep::parse('debconf (>= 1.3.22) | cdebconf (>= 0.43)'))) {
+ tag "settitle-requires-versioned-depends", "$file"
unless $type eq 'udeb';
}
$usessettitle = 1;
@@ -437,15 +435,17 @@
tag "postrm-does-not-purge-debconf", "";
}
-# Check that the right dependencies are in the control file.
+# Check that the right dependencies are in the control file. Accept any
+# package that might provide debconf functionality.
+my $anydebconf = Dep::parse(join (' | ', @debconfs));
if ($usespreinst) {
- unless (Dep::implies($dependencies{'pre-depends'}, Dep::parse('debconf'))) {
+ unless (Dep::implies($dependencies{'pre-depends'}, $anydebconf)) {
tag "missing-debconf-dependency-for-preinst", ""
unless $type eq 'udeb';
}
} else {
- unless (Dep::implies($alldependencies, Dep::parse('debconf')) or $usesdbconfig) {
+ unless (Dep::implies($alldependencies, $anydebconf) or $usesdbconfig) {
tag "missing-debconf-dependency", "";
}
}
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-04-11 02:59:33 UTC (rev 842)
+++ trunk/debian/changelog 2007-04-11 03:13:49 UTC (rev 843)
@@ -32,6 +32,12 @@
+ [RA] Allow a build dependency on automake to satisfy the
autotools-dev requirement since users may use autoreconf to update
config.{sub,guess}. Thanks, Jordà Polo. (Closes: #417067)
+ * checks/debconf:
+ + [RA] Rather than munging dependencies to cope with the various
+ implementations of debconf, take advantage of our new dependency
+ comparison routines and check the full correct dependency. This
+ should really fix problems with checking the dependencies for
+ settitle. Patch from Damyan Ivanov. (Closes: #349616)
* checks/debhelper.desc:
+ [RA] Use consistent file naming when diagnosing possibly conflicting
debhelper compat settings. Thanks, Jari Aalto. (Closes: #409122)
Reply to: