about summary refs log tree commit diff
path: root/debian/network-manager.preinst
diff options
context:
space:
mode:
Diffstat (limited to 'debian/network-manager.preinst')
-rw-r--r--debian/network-manager.preinst7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 5bfef656..c00618e7 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -44,10 +44,10 @@ case "$1" in
 	# Upgrade from previous versions
         if dpkg --compare-versions "$2" lt "0.6.4-8"; then
 	    if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then
-		/etc/dbus-1/event.d/25NetworkManager stop   
+		/etc/dbus-1/event.d/25NetworkManager stop
 	    fi
 	    if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then
-		/etc/dbus-1/event.d/26NetworkManagerDispatcher stop   
+		/etc/dbus-1/event.d/26NetworkManagerDispatcher stop
 	    fi
 	    rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager
 	    rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher
@@ -67,6 +67,9 @@ case "$1" in
 	        mv /var/run/NetworkManager/NetworkManager.pid /var/run/
 	    fi
 	fi
+	if dpkg --compare-versions "$2" lt "0.7.998-1"; then
+	    rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf
+	fi
 	;;
 
     abort-upgrade)