From 63242af5d6ebf808fcaff9ebb59d897646792042 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Wed, 18 Jun 2008 13:05:11 +0000
Subject: Merge mbiebl's packaging

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2304 ceb527fc-18e6-0310-9fe2-813c157c29e7
---
 debian/network-manager.preinst | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'debian/network-manager.preinst')

diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 3f737448..8b64b293 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -15,8 +15,8 @@
 #	<old-preinst> abort-upgrade <new-version>
 
 
-# Prepare to remove a no-longer used conffile
-prep_rm_conffile()
+# remove a no-longer used conffile
+rm_conffile()
 {
     PKGNAME="$1"
     CONFFILE="$2"
@@ -25,20 +25,19 @@ prep_rm_conffile()
 	md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
 	old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
 	if [ "$md5sum" != "$old_md5sum" ]; then
-	    echo "Obsolete conffile $CONFFILE has been modified by you, renaming to .dpkg-bak"
+	    echo "Obsolete conffile $CONFFILE has been modified by you."
+	    echo "Saving as $CONFFILE.dpkg-bak ..."
 	    mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
 	else
-	    mv -f "$CONFFILE" "$CONFFILE".dpkg-remove
+	    echo "Removing obsolete conffile $CONFFILE ..."
+	    rm -f "$CONFFILE"
 	fi
     fi
 }
 
 
 case "$1" in
-    install)
-        ;;
-
-    upgrade)
+    install|upgrade)
 	# Upgrade from previous versions
         if dpkg --compare-versions "$2" lt "0.6.4-8"; then
 	    if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then
@@ -47,8 +46,15 @@ case "$1" in
 	    if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then
 		/etc/dbus-1/event.d/26NetworkManagerDispatcher stop   
 	    fi
-	    prep_rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager
-	    prep_rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher
+	    rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager
+	    rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher
+	fi
+	if dpkg --compare-versions "$2" lt "0.7.0~svn3624-1"; then
+	    if [ -x "/etc/init.d/network-manager-dispatcher" ]; then
+	        invoke-rc.d network-manager-dispatcher stop
+	    fi
+	    rm_conffile network-manager /etc/init.d/network-manager-dispatcher
+	    update-rc.d network-manager-dispatcher remove >/dev/null
 	fi
 	;;
 
-- 
cgit 1.3.0-6-gf8a5