diff -urN dbmail-1.2.3/config.log dbmail-1.2.3-dw/config.log
--- dbmail-1.2.3/config.log	2004-03-05 22:08:27.000000000 -0500
+++ dbmail-1.2.3-dw/config.log	2004-03-05 22:07:55.000000000 -0500
@@ -12,7 +12,7 @@
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on tsuki
+on mirrorlynx.com
 
 config.status:650: creating pgsql/Makefile
 config.status:963: executing default-1 commands
@@ -30,7 +30,7 @@
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on tsuki
+on mirrorlynx.com
 
 config.status:650: creating mysql/Makefile
 config.status:963: executing default-1 commands
diff -urN dbmail-1.2.3/debian/control dbmail-1.2.3-dw/debian/control
--- dbmail-1.2.3/debian/control	2004-03-05 22:08:27.000000000 -0500
+++ dbmail-1.2.3-dw/debian/control	2004-03-05 22:02:50.000000000 -0500
@@ -7,9 +7,9 @@
 
 Package: dbmail-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.0.32), ucf (>= 0.30)
-Provides: imap-server, pop3-server
-Conflicts: imap-server, pop3-server
+Depends: ${shlibs:Depends}, debconf (>= 1.0.32), ucf (>= 0.30), dbmail-common (= ${UpstreamVersion})
+Provides: imap-server, pop3-server, dbmail-server (= ${UpstreamVersion})
+Conflicts: imap-server, pop3-server, dbmail-server
 Suggests: stunnel, exim4 | mail-transport-agent
 Description: Fast and scalable sql based imap and pop mailserver
  DBMAIL is a collection of programs that enables email to be
@@ -19,9 +19,9 @@
 
 Package: dbmail-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.0.32), ucf (>= 0.30)
-Provides: imap-server, pop3-server
-Conflicts: imap-server, pop3-server
+Depends: ${shlibs:Depends}, debconf (>= 1.0.32), ucf (>= 0.30), dbmail-common (= ${UpstreamVersion})
+Provides: imap-server, pop3-server, dbmail-server (= ${UpstreamVersion})
+Conflicts: imap-server, pop3-server, dbmail-server
 Suggests: stunnel, exim4 | mail-transport-agent
 Description: Fast and scalable sql based imap and pop mailserver
  DBMAIL is a collection of programs that enables email to be
@@ -29,3 +29,11 @@
  .
  This is the MySQL build.
 
+Package: dbmail
+Architecture: all
+Depends: dbmail-server (= ${UpstreamVersion})
+Provides: dbmail-common (= ${UpstreamVersion})
+Description: Common package for the DBMAIL system
+ This package includes all init scripts and cron scripts for the DBMAIL system. 
+ It is also a meta package for the DBMAIL servers.
+
diff -urN dbmail-1.2.3/debian/dbmail.default dbmail-1.2.3-dw/debian/dbmail.default
--- dbmail-1.2.3/debian/dbmail.default	1969-12-31 19:00:00.000000000 -0500
+++ dbmail-1.2.3-dw/debian/dbmail.default	2004-03-05 21:49:32.000000000 -0500
@@ -0,0 +1,14 @@
+# debian specific configuration for dbmail
+
+# comment out to disable the pop3 server
+START_POP3D=true
+
+# comment out to disable the imapd server
+START_IMAPD=true
+
+# comment out to enable the stunnel SSL wrapper
+#START_SSL=true
+
+# specify the filename for the pem file as 
+# it resides in /etc/ssl/certs
+#PEMFILE="dbmail.pem"
diff -urN dbmail-1.2.3/debian/dbmail.substvars dbmail-1.2.3-dw/debian/dbmail.substvars
--- dbmail-1.2.3/debian/dbmail.substvars	2004-03-05 22:08:27.000000000 -0500
+++ dbmail-1.2.3-dw/debian/dbmail.substvars	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-misc:Depends=debconf (>= 0.5)
diff -urN dbmail-1.2.3/debian/rules dbmail-1.2.3-dw/debian/rules
--- dbmail-1.2.3/debian/rules	2004-03-05 22:08:27.000000000 -0500
+++ dbmail-1.2.3-dw/debian/rules	2004-03-05 21:59:01.000000000 -0500
@@ -3,15 +3,17 @@
 # -*- sh -*-
 
 # Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-#export DEB_BUILD_OPTIONS=debug
+export DH_VERBOSE=1
+export DEB_BUILD_OPTIONS=debug
 
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
+
 CFLAGS = -Wall -O3
 LDFLAGS = -lcrypt
 
+UPSTREAMVERSION := $(shell dpkg-parsechangelog | sed -n '/^Version: [0-9\.]\+-.\+/{s/^Version: \([0-9\.]\+\)-.\+/\1/;p;}')
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -108,14 +110,14 @@
 			sed -e "s,usr/share/doc/dbmail,usr/share/doc/dbmail-$$d,g" \
 			< debian/dbmail.$$f > debian/dbmail-$$d.$$f; \
 		done; \
-		dh_installdirs -p $$packagename etc/dbmail usr/sbin etc/init.d etc/cron.d; \
-		install -m 755 debian/dbmail.init debian/$$packagename/etc/init.d/dbmail; \
-		install -m 644 debian/dbmail.cron.d debian/$$packagename/etc/cron.d/dbmail; \
-	done	
+	done
+	dh_installdirs -pdbmail-mysql -pdbmail-pgsql usr/sbin etc/dbmail	
 	for b in $(BINARIES); do \
 		install -m 755 $(BUILDBASE)/dbmail-mysql/$$b debian/dbmail-mysql/usr/sbin/$$b; \
 		install -m 755 $(BUILDBASE)/dbmail-pgsql/$$b debian/dbmail-pgsql/usr/sbin/$$b; \
 	done
+	dh_installinit -pdbmail
+	dh_installcron -pdbmail
 	dh_installdebconf -a
 	dh_installman -a
 	dh_installdocs -A
@@ -128,7 +130,7 @@
 	dh_fixperms 
 	dh_installdeb
 	dh_shlibdeps 
-	dh_gencontrol 
+	dh_gencontrol -- -VUpstreamVersion="${UPSTREAMVERSION}" 
 	dh_md5sums 
 	dh_builddeb