Author: djpig
Date: 2005-10-13 15:16:20 +0200 (Thu, 13 Oct 2005)
New Revision: 506
Modified:
trunk/checks/po-debconf
trunk/debian/changelog
trunk/testset/debconf/debian/control
trunk/testset/tags.debconf
Log:
Previously we only run the po-debconf checks if we found a templates file
and a debconf dependency. Since the latter is mostly generated by
${misc:Depends} nowadays, we now also run the checks if we find
a templates and a config file. (Closes: #331672)
Modified: trunk/checks/po-debconf
===================================================================
--- trunk/checks/po-debconf 2005-10-13 12:51:02 UTC (rev 505)
+++ trunk/checks/po-debconf 2005-10-13 13:16:20 UTC (rev 506)
@@ -31,32 +31,40 @@
# First, check wether this package seems to use debconf but not po-debconf
opendir(DEB, 'debfiles')
or fail("Can't open debfiles directory.");
-my $has_template = 0;
+my $has_template = my $has_depends = my $has_config = 0;
for my $file (readdir(DEB)) {
- if ($file =~ m/^(.+\.)?templates$/) {
+ if ($file =~ m/^(.+\.)?templates(\..+)?$/) {
# TODO: out of this loop, use fields/*?
+ $has_template = 1;
open(IN,"debfiles/control")
or fail("Can't open debfiles/control.");
while (<IN>) {
if (m/^Depends:/i) {
- $has_template = 1
+ $has_depends = 1
if m/\bdebconf(-[.\d]+)?\b/;
}
}
close(IN);
last;
}
+ if ($file =~ m/^(.+\.)?config(\..+)?$/) {
+ $has_config = 1;
+ }
}
closedir(DEB);
+my $probably_uses_debconf = $has_depends || ($has_template && $has_config);
+
#TODO: check whether all templates are named in TEMPLATES.pot
-if ( $has_template && ! -d "debfiles/po" ) {
+if ( $probably_uses_debconf ) {
+ if ( ! -d "debfiles/po" ) {
tag "not-using-po-debconf", "";
-}
+ return 0;
+ }
+} else {
+ return 0;
+}
-# Exit if package does not seem to use po-debconf
-($has_template && -d "debfiles/po") or return(0);
-
my $missing_files = 0;
if (-f "debfiles/po/POTFILES.in") {
open(POTFILES,"debfiles/po/POTFILES.in")
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-10-13 12:51:02 UTC (rev 505)
+++ trunk/debian/changelog 2005-10-13 13:16:20 UTC (rev 506)
@@ -22,6 +22,11 @@
+ [FL] Don't issue install-info-not-called-with-section-option if
the call in postinst is really a removal. Experienced by Ben Pfaff
in autoconf (Closes: #329170)
+ * checks/po-debconf:
+ + [FL] Previously we only run the checks if we found a templates file
+ and a debconf dependency. Since the latter is mostly generated by
+ ${misc:Depends} nowadays, we now also run the checks if we find
+ a templates and a config file. (Closes: #331672)
* checks/scripts:
+ [FL] PythonX.Y dependency can also be satisfied with pythonX.Y-minimal.
Noted by Matthias Klose (Closes: #326643)
Modified: trunk/testset/debconf/debian/control
===================================================================
--- trunk/testset/debconf/debian/control 2005-10-13 12:51:02 UTC (rev
505)
+++ trunk/testset/debconf/debian/control 2005-10-13 13:16:20 UTC (rev
506)
@@ -7,12 +7,12 @@
Package: debconf-test
Architecture: any
-Depends: ${shlibs:Depends}, debconf
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Test package for the debconf checks of lintian
Package: debconf-test-noscripts
Architecture: any
-Depends: ${shlibs:Depends}, debconf
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Test package for the debconf checks of lintian
Package missing postinst/postrm/config
Modified: trunk/testset/tags.debconf
===================================================================
--- trunk/testset/tags.debconf 2005-10-13 12:51:02 UTC (rev 505)
+++ trunk/testset/tags.debconf 2005-10-13 13:16:20 UTC (rev 506)
@@ -1,13 +1,14 @@
E: debconf-test: extended-description-is-empty
E: debconf-test: mismatch-translated-choices choices-de.utf-8
E: debconf-test: settitle-requires-versioned-depends config
+W: debconf source: invalid-po-file debian/po/fr.po
W: debconf source: maintainer-script-lacks-debhelper-token
debian/debconf-test.postinst
W: debconf source: newer-debconf-templates
+W: debconf source: unknown-encoding-in-po-file debian/po/fr.po
W: debconf-test-noscripts: no-debconf-config
W: debconf-test-noscripts: old-fsf-address-in-copyright-file
W: debconf-test-noscripts: postinst-does-not-load-confmodule
W: debconf-test-noscripts: postrm-does-not-purge-debconf
-W: debconf-test: multiselect-without-dependency
W: debconf-test: old-fsf-address-in-copyright-file
W: debconf-test: partially-translated-question debconf/testmulti de.utf-8
W: debconf-udeb udeb: missing-debconf-dependency
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
