4 files changed, 10 insertions, 17 deletions
diff --git a/debian/bitlbee-common.postinst b/debian/bitlbee-common.postinst
index 4587ce7a..de814011 100644
--- a/debian/bitlbee-common.postinst
+++ b/debian/bitlbee-common.postinst
@@ -9,8 +9,6 @@ PORT="$RET"
 
 CONFDIR=/var/lib/bitlbee/
 
-update-rc.d bitlbee defaults > /dev/null 2>&1
-
 ## Load default option. Don't want to put this in debconf (yet?)
 BITLBEE_OPTS=-F
 BITLBEE_DISABLED=0
@@ -91,6 +89,4 @@ else
 	chown bitlbee /etc/bitlbee/bitlbee.conf
 fi
 
-if [ -z "$2" ]; then
-	invoke-rc.d bitlbee start
-fi
+#DEBHELPER#
diff --git a/debian/bitlbee-common.postrm b/debian/bitlbee-common.postrm
index 92465c4a..79e621a1 100644
--- a/debian/bitlbee-common.postrm
+++ b/debian/bitlbee-common.postrm
@@ -2,15 +2,10 @@
 
 set -e
 
-[ "$1" = "purge" ] || exit 0
-
-if [ -e /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule;
-	db_purge;
+if [ "$1" = "purge" ]; then
+	rm -f /etc/default/bitlbee
+	deluser --system bitlbee || true
+	rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
 fi
 
-update-rc.d bitlbee remove > /dev/null 2>&1 || true
-rm -f /etc/default/bitlbee
-
-deluser --system bitlbee || true
-rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
+#DEBHELPER#
diff --git a/debian/bitlbee-common.prerm b/debian/bitlbee-common.prerm
index ea96180f..ba46e981 100644
--- a/debian/bitlbee-common.prerm
+++ b/debian/bitlbee-common.prerm
@@ -10,6 +10,6 @@ if [ "$1" = "upgrade" ]; then
 		rm -f /usr/share/bitlbee/help.upgrading
 		mv /usr/share/bitlbee/help.txt /usr/share/bitlbee/help.upgrading
 	fi
-else
-	invoke-rc.d bitlbee stop
 fi
+
+#DEBHELPER#
diff --git a/debian/bitlbee.prerm b/debian/bitlbee.prerm
index e5d03404..2c9f6ab9 100644
--- a/debian/bitlbee.prerm
+++ b/debian/bitlbee.prerm
@@ -5,3 +5,5 @@ set -e
 if [ "$1" != "upgrade" ]; then
 	invoke-rc.d bitlbee stop
 fi
+
+#DEBHELPER#