summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul@7b491191-dbf0-0310-aff6-d879d4d69008>2008-03-24 14:49:33 +0000
committerpaul <paul@7b491191-dbf0-0310-aff6-d879d4d69008>2008-03-24 14:49:33 +0000
commitb4cd8396361044dbdff99701ebbf95fbed8c135b (patch)
tree49d8e5823af472ad64a1a06592ad492207df2041
parent0ff3dfff8c8b0756744d5f06c9954d670eeffc5f (diff)
git-svn-id: https://svn.ic-s.nl/svn/dbmail/branches/dbmail_2_2_branch@2957 7b491191-dbf0-0310-aff6-d879d4d69008
-rw-r--r--ChangeLog5
-rw-r--r--VERSION2
-rw-r--r--debian/changelog9
-rw-r--r--debian/control5
-rw-r--r--debian/dbmail.postrm2
5 files changed, 20 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index abbb06f4..3ea06c1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-24 Paul J Stevens <paul@nfg.nl>
+
+ * VERSION, debian/changelog, debian/control, debian/dbmail.postrm:
+ v2.2.10
+
2008-03-15 Paul J Stevens <paul@nfg.nl>
* VERSION:
diff --git a/VERSION b/VERSION
index 941d2c33..0d3ad67a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.10-rc2
+2.2.10
diff --git a/debian/changelog b/debian/changelog
index 3c9c9b40..6d82c1d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dbmail (2.2.10-1) unstable; urgency=low
+
+ * new upstream release (Closes: #471255).
+ * accept Ubuntu changes:
+ - move adduser from Depends to Pre-Depends. Closes: #470182
+ - remove user dbmail after package removal
+
+ -- Paul J Stevens <paul@nfg.nl> Mon, 24 Mar 2008 15:45:41 +0100
+
dbmail (2.2.9-1) unstable; urgency=low
* upstream release
diff --git a/debian/control b/debian/control
index ab1e11aa..bf14c11c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,12 @@ Section: mail
Priority: optional
Maintainer: Paul J Stevens <paul@nfg.nl>
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
+Standards-Version: 3.7.3
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 --git a/debian/dbmail.postrm b/debian/dbmail.postrm
index 6d744f97..f63c5e4a 100644
--- a/debian/dbmail.postrm
+++ b/debian/dbmail.postrm
@@ -13,6 +13,8 @@ if [ "$1" = "purge" ]; then
ucf --purge /etc/dbmail/dbmail.conf || true
ucf --purge /etc/default/dbmail || true
+ userdel dbmail 2>&1 > /dev/null || true
+
db_purge || true
fi