lintian: r844 - in trunk: checks debian testset testset/debconf/debian
Author: rra
Date: 2007-04-11 05:35:40 +0200 (Wed, 11 Apr 2007)
New Revision: 844
Modified:
trunk/checks/debconf
trunk/checks/debconf.desc
trunk/debian/changelog
trunk/testset/debconf/debian/debconf-test.templates
trunk/testset/tags.debconf
Log:
+ [RA] Check that an appropriate versioned dependency on debconf
and/or cdebconf is present if error template types are used.
Thanks, Christian Perrier. (Closes: #416140)
Modified: trunk/checks/debconf
===================================================================
--- trunk/checks/debconf 2007-04-11 03:13:49 UTC (rev 843)
+++ trunk/checks/debconf 2007-04-11 03:35:40 UTC (rev 844)
@@ -52,7 +52,6 @@
title
error
);
-$valid_types{error} = 1 if $type eq 'udeb';
# From debconf-devel(7), section 'THE DEBCONF PROTOCOL' under 'INPUT', up to
# date with debconf version 1.5.3.
@@ -191,6 +190,11 @@
} elsif ($template->{type} eq 'multiselect') {
$isselect=1;
$usesmultiselect=1;
+ } elsif ($template->{type} eq 'error') {
+ unless (Dep::implies($alldependencies, Dep::parse('debconf (>= 1.4.69) | cdebconf (>= 0.39)'))) {
+ tag "debconf-error-requires-versioned-depends", "$template->{template}"
+ unless $type eq 'udeb';
+ }
} elsif ($template->{type} eq 'boolean') {
tag "boolean-template-has-bogus-default",
"$template->{template} $template->{default}"
Modified: trunk/checks/debconf.desc
===================================================================
--- trunk/checks/debconf.desc 2007-04-11 03:13:49 UTC (rev 843)
+++ trunk/checks/debconf.desc 2007-04-11 03:35:40 UTC (rev 844)
@@ -183,6 +183,16 @@
debconf-2.0 alternative to allow for cdebconf or other implementations.
Instead, use <tt>debconf (>= 1.3.22) | cdebconf (>= 0.43)</tt>.
+Tag: debconf-error-requires-versioned-depends
+Type: error
+Info: Debconf only supports the error template type as of version 1.4.69.
+ Packages that use this template type should declare a dependency on that
+ version of debconf.
+ .
+ Since error types were added after debconf-2.0, one cannot use the normal
+ debconf-2.0 alternative to allow for cdebconf or other implementations.
+ Instead, use <tt>debconf (>= 1.4.69) | cdebconf (>= 0.39)</tt>.
+
Tag: malformed-prompt-in-templates
Type: warning
Info: The short description of a select, multiselect, string and password
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-04-11 03:13:49 UTC (rev 843)
+++ trunk/debian/changelog 2007-04-11 03:35:40 UTC (rev 844)
@@ -38,6 +38,9 @@
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)
+ + [RA] Check that an appropriate versioned dependency on debconf
+ and/or cdebconf is present if error template types are used.
+ Thanks, Christian Perrier. (Closes: #416140)
* checks/debhelper.desc:
+ [RA] Use consistent file naming when diagnosing possibly conflicting
debhelper compat settings. Thanks, Jari Aalto. (Closes: #409122)
Modified: trunk/testset/debconf/debian/debconf-test.templates
===================================================================
--- trunk/testset/debconf/debian/debconf-test.templates 2007-04-11 03:13:49 UTC (rev 843)
+++ trunk/testset/debconf/debian/debconf-test.templates 2007-04-11 03:35:40 UTC (rev 844)
@@ -82,3 +82,8 @@
_Default: English[ translators, see the comment in the PO files]
_Description: The default language, an example of a default that should
be translated.
+
+Template: debconf/error
+Type: error
+_Description: An error occurred
+ This is a sample Debconf error template.
Modified: trunk/testset/tags.debconf
===================================================================
--- trunk/testset/tags.debconf 2007-04-11 03:13:49 UTC (rev 843)
+++ trunk/testset/tags.debconf 2007-04-11 03:35:40 UTC (rev 844)
@@ -1,6 +1,7 @@
E: debconf source: declares-possibly-conflicting-debhelper-compat-versions rules=4 compat=4
E: debconf source: missing-dh_python-build-dependency python | python-dev | python-all-dev
E: debconf source: package-needs-python-policy-debhelper
+E: debconf-test: debconf-error-requires-versioned-depends debconf/error
E: debconf-test: extended-description-is-empty
E: debconf-test: mismatch-translated-choices debconf/testmulti-escape choices-de.utf-8
E: debconf-test: no-template-description debconf/no-description
Reply to: