"Oh no, not him again", says Jon...:-) Actually, this contribution is less invasive and controversial than the former we had to deal with, I think.
With the removal of debconf stuff, I think that #351394 can be closed as it becomes obviously useless to switch to po-debconf for templates. This means that debian/qmail.templates and debian/qmail.config can be removed from the package. Some references to debconf perl modules can also probably be removed from the maintainer scripts and, finally, the dependencies and build dependencies on debconf can be removed as well. (BTW, having Build-Depends for the qmail-src binary package sounds weird to me). Attached is a patch. That patch should close the following bug reports: #351394, #330785, #331009 --
diff -Nru qmail-1.03.ori/debian/control qmail-1.03/debian/control
--- qmail-1.03.ori/debian/control 2006-10-31 20:34:47.819191126 +0100
+++ qmail-1.03/debian/control 2006-11-01 11:30:44.412404207 +0100
@@ -2,13 +2,13 @@
Maintainer: Jon Marler <[EMAIL PROTECTED]>
Section: non-free/mail
Priority: extra
-Build-Depends: dpkg-dev (>= 1.4.0.20), patch (>= 2.5-0bo1), gcc, make,
fakeroot | sudo, groff-base, debconf | debconf-2.0
+Build-Depends: dpkg-dev (>= 1.4.0.20), patch (>= 2.5-0bo1), gcc, make,
fakeroot | sudo, groff-base
Standards-Version: 3.5.0.0
Package: qmail-src
Architecture: all
-Depends: dpkg-dev (>= 1.4.0.20), patch (>= 2.5-0bo1), gcc, make, fakeroot |
sudo, groff-base, debconf | debconf-2.0
-Build-Depends: dpkg-dev (>= 1.4.0.20), patch (>= 2.5-0bo1), gcc, make,
fakeroot | sudo, groff-base, debconf | debconf-2.0
+Depends: dpkg-dev (>= 1.4.0.20), patch (>= 2.5-0bo1), gcc, make, fakeroot |
sudo, groff-base
+Build-Depends: dpkg-dev (>= 1.4.0.20), patch (>= 2.5-0bo1), gcc, make,
fakeroot | sudo, groff-base
Conflicts: qmail-run, qmail-uids-gids
Section: non-free/mail
Recommends: ucspi-tcp-src, procmail
diff -Nru qmail-1.03.ori/debian/postinst qmail-1.03/debian/postinst
--- qmail-1.03.ori/debian/postinst 2006-10-31 20:34:47.835191288 +0100
+++ qmail-1.03/debian/postinst 2006-11-01 11:28:53.723514891 +0100
@@ -1,8 +1,5 @@
#!/usr/bin/perl
-use Debconf::Client::ConfModule ':all';
-version('2.0');
-
# do not print anything to STDOUT, as debconf will interpret it as a command
sub debug ($) {
my($msg) = @_;
diff -Nru qmail-1.03.ori/debian/postrm qmail-1.03/debian/postrm
--- qmail-1.03.ori/debian/postrm 2006-10-31 20:34:47.835191288 +0100
+++ qmail-1.03/debian/postrm 2006-11-01 11:29:14.003677734 +0100
@@ -1,8 +1,5 @@
#!/usr/bin/perl
-use Debconf::Client::ConfModule ':all';
-version('2.0');
-
$| = 1;
$action = shift @ARGV;
diff -Nru qmail-1.03.ori/debian/preinst qmail-1.03/debian/preinst
--- qmail-1.03.ori/debian/preinst 2006-10-31 20:34:47.835191288 +0100
+++ qmail-1.03/debian/preinst 2006-11-01 11:29:53.139992106 +0100
@@ -3,7 +3,6 @@
require 5.002;
use strict 'subs';
use English;
-use Debconf::Client::ConfModule ':all';
# do not print anything to STDOUT, as debconf will interpret it as a command.
# This is not an issue with preinst/postinst scripts written in shell,
diff -Nru qmail-1.03.ori/debian/qmail.config qmail-1.03/debian/qmail.config
--- qmail-1.03.ori/debian/qmail.config 2006-10-31 20:34:47.851191450 +0100
+++ qmail-1.03/debian/qmail.config 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
diff -Nru qmail-1.03.ori/debian/qmail.templates
qmail-1.03/debian/qmail.templates
--- qmail-1.03.ori/debian/qmail.templates 2006-10-31 20:34:47.851191450
+0100
+++ qmail-1.03/debian/qmail.templates 1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-Template: qmail/readme
-Type: note
-Description: README
- Before making any changes to your qmail configuration, please read
- /usr/share/doc/qmail/README.Debian.gz. This contains a description of the
- differences bewtween other mailers on Debian, qmail on Debian, and qmail on
- other systems.
- .
- If you were using sendmail (or smail) previously, you will also want to read
- the "qmail-upgrade" manpage, which details user-visible differences between
- sendmail and qmail.
- .
- If you are new to qmail, you will want to at least peruse the qmail FAQ, which
- can be found in /usr/doc/qmail
-
-Template: qmail/start
-Type: select
-Choices: yes, no
-Description: Do you want to start qmail now?
-
-Template: qmail/reboot
-Type: note
-Description: Qmail will be started at the next reboot.
- Or you can start qmail manually when
- you are ready by typing (as root) "/etc/init.d/qmail start" at a shell prompt.
-
-Template: qmail/userpurge
-Type: select
-Choices: yes, no
-Description: Remove qmail users during a purge?
-
-Template: qmail/recipientmap
-Type: note
-Description: WARNING!
- recipientmap is gone from qmail-1.03. The virtualdomains mechanism
- has been expanded to support virtual users. You will need to fix your setup.
-
-Template: qmail/qlist
-Type: note
-Description: WARNING!
- qlist has been split into a separate package by Dan Bernstein (the
- author of qmail) since qmail-1.02.
- .
- I was not planning on debianising qlist, because ezmlm does a better job,
- so if you still want qlist, you can either get it direct from
- http://pobox.com/~djb/qlist.html
- .
- Please check in /usr/doc/qmail and the man pages for changes since qmail 1.01
-
-Template: qmail/inetd
-Type: note
-Description: inetd.conf changes
- inetd does not handle qmail terribly effectively, so I have decided
- to make the default instalation use tcpserver from ucspi-tcp instead.
- .
- For this reason, I have disabled the smtp line in /etc/inetd.conf.
- .
- This means that you must configure things such as RELAYCLIENT using
- /etc/tcp.smtp, rather than hosts allow (see /usr/doc/qmail/README for details)
-
-Template: qmail/tcpupdate
-Type: note
-Description: Updating /etc/tcp.smtp database for tcpserver
-
-Template: qmail/override
-Type: select
-Choices: yes, no
-Description: Pre-existing qmail installation detected. Override?
-
diff -Nru qmail-1.03.ori/debian/rules qmail-1.03/debian/rules
--- qmail-1.03.ori/debian/rules 2006-10-31 20:34:47.835191288 +0100
+++ qmail-1.03/debian/rules 2006-11-01 11:30:22.516228184 +0100
@@ -135,11 +135,6 @@
debian/prerm debian/postrm debian/tmp/DEBIAN
$(INSTALL) -o root -g root -m 644 -p debian/conffiles
debian/tmp/DEBIAN/conffiles
- # Install debconf stuff
- cp debian/qmail.config debian/tmp/DEBIAN/config
- cp debian/qmail.templates debian/tmp/DEBIAN/templates
- chmod 755 debian/tmp/DEBIAN/config debian/tmp/DEBIAN/templates
- chmod u+x debian/*config
## Install logcheck files
#$(INSTALL) -o root -g root -d debian/tmp/etc/logcheck/ignore.d.server
signature.asc
Description: Digital signature
