diff -u dbmail-2.2.6/debian/control dbmail-2.2.6/debian/control --- dbmail-2.2.6/debian/control +++ dbmail-2.2.6/debian/control @@ -1,13 +1,15 @@ Source: dbmail Section: mail Priority: optional -Maintainer: Paul J Stevens +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Paul J Stevens Build-Depends: automake1.9, debhelper (>= 5.0.7), dpatch, libsieve2-dev (>= 2.1.12), libglib2.0-dev, libgmime-2.0-2-dev | libgmime2.1-dev, libldap2-dev, libsqlite3-dev, libpq-dev, libmysqlclient15-dev | libmysqlclient14-dev, pkg-config, libtool, asciidoc, xmlto, chrpath, po-debconf Standards-Version: 3.7.2 Package: dbmail Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, ucf (>= 0.30), adduser +Pre-depends: adduser +Depends: ${misc:Depends}, ${shlibs:Depends}, ucf (>= 0.30) Provides: imap-server, pop3-server Suggests: dbmail-pgsql | dbmail-mysql, sqlite3 Description: base package for the dbmail email solution diff -u dbmail-2.2.6/debian/dbmail.postrm dbmail-2.2.6/debian/dbmail.postrm --- dbmail-2.2.6/debian/dbmail.postrm +++ dbmail-2.2.6/debian/dbmail.postrm @@ -13,7 +13,10 @@ ucf --purge /etc/dbmail/dbmail.conf || true ucf --purge /etc/default/dbmail || true + userdel dbmail 2>&1 > /dev/null || true + db_purge || true + fi #DEBHELPER# diff -u dbmail-2.2.6/debian/dbmail.postinst dbmail-2.2.6/debian/dbmail.postinst --- dbmail-2.2.6/debian/dbmail.postinst +++ dbmail-2.2.6/debian/dbmail.postinst @@ -24,26 +24,9 @@ # so that unnecessary prompting doesn't happen if a package's # installation fails and the `postinst' is called with `abort-upgrade', # `abort-remove' or `abort-deconfigure'. -create_user() { - # creating dbmail group if he isn't already there - getent group dbmail >/dev/null 2>&1 || \ - addgroup --system dbmail >/dev/null 2>&1 || true - - # creating dbmail user if he isn't already there - getent passwd dbmail >/dev/null 2>&1 || \ - adduser \ - --system \ - --ingroup dbmail \ - --home /dev/null \ - --gecos "Dbmail SQL mailserver" \ - --shell /bin/false \ - dbmail >/dev/null 2>&1 || true -} - case "$1" in install|upgrade) - create_user ;; configure) @@ -118,6 +101,8 @@ rm ${CONFIG_EX} ${DEBIAN_CONFIG_EX} + rm ${CONFIG_EX} ${DEBIAN_CONFIG_EX} + # activate the sqlite driver by default sed -i 's/\(^driver\W*=\)\(\W*$\)/\1 sqlite/' $CONFIG diff -u dbmail-2.2.6/debian/changelog dbmail-2.2.6/debian/changelog --- dbmail-2.2.6/debian/changelog +++ dbmail-2.2.6/debian/changelog @@ -1,3 +1,16 @@ +dbmail (2.2.6-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - from 2.2.5-1ubuntu1 + + Move adduser to Pre-Depends + + Move user and group creation to preinst, so they can be added + correctly + + Remove user and group during package removal + + Recreate /var/run/dbmail at startup + + Update maintainer field in debian/control + + -- Christophe Sauthier Mon, 05 Nov 2007 23:50:50 +0100 + dbmail (2.2.6-2) unstable; urgency=low * fix a critical regression @@ -12,4 +25,19 @@ -- Paul J Stevens Sat, 15 Sep 2007 10:42:41 +0200 +dbmail (2.2.5-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Move adduser to Pre-Depends + - Move user and group creation to preinst, so they can be added correctly + - Delete gzipped config files in /usr/share/doc/dbmail/examples which + caused incorrect package removal + - No need to delete /etc/dbmail in postrm, removal will be handled + automatically since it has been created by dh_installdirs + - Remove user and group during package removal + - Recreate /var/run/dbmail at startup + - Update maintainer field in debian/control + + -- Andrea Veri Wed, 06 Jun 2007 22:22:03 +0100 + dbmail (2.2.5-1) unstable; urgency=low @@ -25,6 +53,21 @@ -- Paul J Stevens Sun, 11 Mar 2007 21:54:37 +0100 dbmail (2.2.3-1) unstable; urgency=low +dbmail (2.2.3-1ubuntu1) gutsy; urgency=low + + * Move adduser to Pre-Depends + * Move user and group creation to preinst, so they can be added correctly + * Delete gzipped config files in /usr/share/doc/dbmail/examples which + caused incorrect package removal + * No need to delete /etc/dbmail in postrm, removal will be handled + automatically since it has been created by dh_installdirs + * Remove user and group during package removal + * Recreate /var/run/dbmail at startup (LP: #117793) + * Update maintainer field in debian/control + + -- Luca Falavigna Thu, 31 May 2007 23:54:06 +0200 + +dbmail (2.2.3-1) unstable; urgency=low [ Paul J Stevens ] * remove configure code from postinst, leaving the driver alone. @@ -201,0 +245 @@ + only in patch2: unchanged: --- dbmail-2.2.6.orig/debian/dbmail.init +++ dbmail-2.2.6/debian/dbmail.init @@ -45,6 +45,11 @@ [ -e /etc/default/dbmail ] && . /etc/default/dbmail +if [ ! -d ${PID_DIR} ]; then + mkdir -p -m 0755 ${PID_DIR} + chown dbmail:dbmail ${PID_DIR} +fi + service_start() { eval '_daemon=$'$1 eval '_name=$'$1'_NAME' only in patch2: unchanged: --- dbmail-2.2.6.orig/debian/dbmail.preinst +++ dbmail-2.2.6/debian/dbmail.preinst @@ -0,0 +1,40 @@ +#!/bin/sh + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' + +case "$1" in + install|upgrade) + # creating dbmail group if he isn't already there + getent group dbmail >/dev/null 2>&1 || \ + addgroup --system dbmail >/dev/null 2>&1 || true + + # creating dbmail user if he isn't already there + getent passwd dbmail >/dev/null 2>&1 || \ + adduser \ + --system \ + --ingroup dbmail \ + --home /dev/null \ + --gecos "Dbmail SQL mailserver" \ + --shell /bin/false \ + dbmail >/dev/null 2>&1 || true + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 +