=== modified file 'debian/control'
--- debian/control	2008-09-19 16:04:11 +0000
+++ debian/control	2008-09-19 17:30:43 +0000
@@ -10,9 +10,8 @@
 
 Package: mandos
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.5),
-	python-gnutls, python-dbus, python-avahi, avahi-daemon,
-	gnupg (< 2)
+Depends: python (>=2.5), python-gnutls, python-dbus, python-avahi,
+	avahi-daemon, gnupg (< 2), adduser
 Recommends: fping
 Description: a server giving encrypted passwords to Mandos clients
  This is the server part of the Mandos system, which allows
@@ -31,7 +30,7 @@
 
 Package: mandos-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, adduser
 Enhances: cryptsetup
 Description: do unattended reboots with an encrypted root file system
  This is the client part of the Mandos system, which allows

=== modified file 'debian/mandos-client.postinst'
--- debian/mandos-client.postinst	2008-09-19 16:41:13 +0000
+++ debian/mandos-client.postinst	2008-09-19 17:30:43 +0000
@@ -17,12 +17,12 @@
 
 . /usr/share/debconf/confmodule
 
-# Update the initial RAM filesystem image
+# Update the initial RAM file system image
 update_initramfs()
 {
-	if type update-initramfs >/dev/null 2>&1; then
-		update-initramfs -u
-	fi
+    if [ -x /usr/sbin/update-initramfs ]; then
+	update-initramfs -u -k all
+    fi
 }
 
 # Add user and group
@@ -30,7 +30,7 @@
     if ! getent passwd mandos >/dev/null; then
 	adduser --disabled-password  --quiet --system \
 	    --home /var/run/mandos --no-create-home \
-	    --gecos "Mandos password daemon" --group mandos
+	    --gecos "Mandos password system" --group mandos
     fi
 }
 
@@ -40,7 +40,7 @@
 	-a -r /etc/keys/mandos/seckey.txt ]; then
 	return 0
     fi
-    if type mandos-keygen >/dev/null 2>&1; then
+    if [ -x /usr/sbin/mandos-keygen ]; then
 	mandos-keygen
     fi
 }

=== modified file 'debian/mandos-client.postrm'
--- debian/mandos-client.postrm	2008-09-19 00:00:51 +0000
+++ debian/mandos-client.postrm	2008-09-19 17:30:43 +0000
@@ -27,15 +27,14 @@
 #       <new-postrm> abort-upgrade <old-version>
 
 
-# Update the initramfs
+# Update the initial RAM file system image
 update_initramfs()
 {
-	if type update-initramfs >/dev/null 2>&1 ; then
-		update-initramfs -u -k all
-	fi
+    if [ -x /usr/sbin/update-initramfs ]; then
+	update-initramfs -u -k all
+    fi
 }
 
-
 case "$1" in
     remove)
 	update_initramfs
@@ -46,7 +45,6 @@
 	rm --force /etc/mandos/plugin-runner.conf \
 	    /etc/keys/mandos/pubkey.txt \
 	    /etc/keys/mandos/seckey.txt
-	rmdir /etc/keys/mandos /etc/mandos/plugins.d /etc/mandos || :
 	;;
     upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)
 	;;

=== modified file 'debian/mandos.postinst'
--- debian/mandos.postinst	2008-09-19 00:54:24 +0000
+++ debian/mandos.postinst	2008-09-19 17:30:43 +0000
@@ -22,7 +22,7 @@
 	if ! getent passwd mandos >/dev/null; then
 	    adduser --disabled-password  --quiet --system \
 		--home /var/run/mandos --no-create-home \
-		--gecos "Mandos password daemon" --group mandos
+		--gecos "Mandos password system" --group mandos
 	fi
 	;;