diff -u dbmail-2.2.7/debian/changelog dbmail-2.2.7/debian/changelog
--- dbmail-2.2.7/debian/changelog
+++ dbmail-2.2.7/debian/changelog
@@ -1,3 +1,12 @@
+dbmail (2.2.7-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Change from 2.2.5-1ubuntu1:
+      + Remove user and group during package removal
+    - Remove of a dupplicate line in the dbmail.postinst file
+
+ -- Christophe Sauthier <christophe.sauthier@gmail.com>  Tue, 06 Nov 2007 22:11:42 +0100
+
 dbmail (2.2.7-1) unstable; urgency=low
 
   * new upstream release
@@ -17,6 +26,21 @@
 
  -- Paul J Stevens <paul@nfg.nl>  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 <bluekuja@ubuntu.com>  Wed, 06 Jun 2007 22:22:03 +0100
+
 dbmail (2.2.5-1) unstable; urgency=low
 
   * new upstream release (Closes: #412741, #415958, #423832)
@@ -31,6 +55,21 @@
  -- Paul J Stevens <paul@nfg.nl>  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 <dktrkranz@ubuntu.com>  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.
@@ -207,0 +247 @@
+
only in patch2:
unchanged:
--- dbmail-2.2.7.orig/debian/control
+++ dbmail-2.2.7/debian/control
@@ -1,13 +1,15 @@
 Source: dbmail
 Section: mail
 Priority: optional
-Maintainer: Paul J Stevens <paul@nfg.nl>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-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
 
 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
only in patch2:
unchanged:
--- dbmail-2.2.7.orig/debian/dbmail.postrm
+++ dbmail-2.2.7/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#