[Pkg-utopia-commits] r3394 - in /packages/experimental/networkmanager/debian: changelog network-manager.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jan 21 23:38:04 2010
New Revision: 3394

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3394
Log:
Remove the obsolete conffile /etc/dbus-1/system.d/nm-system-settings.conf
on upgrades.

Modified:
    packages/experimental/networkmanager/debian/changelog
    packages/experimental/networkmanager/debian/network-manager.preinst

Modified: packages/experimental/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/changelog?rev=3394&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/changelog (original)
+++ packages/experimental/networkmanager/debian/changelog Thu Jan 21 23:38:04 2010
@@ -33,6 +33,9 @@
     - Update LSB header: Replace hal dependency with udev.
     - The nm-system-settings daemon has been merged into the NetworkManager
       daemon, so we no longer need to kill nm-system-settings on "stop".
+  * debian/network-manager.preinst
+    - Remove the obsolete conffile
+      /etc/dbus-1/system.d/nm-system-settings.conf on upgrades.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 29 Nov 2009 10:19:59 +0100
 

Modified: packages/experimental/networkmanager/debian/network-manager.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/network-manager.preinst?rev=3394&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/network-manager.preinst (original)
+++ packages/experimental/networkmanager/debian/network-manager.preinst Thu Jan 21 23:38:04 2010
@@ -44,10 +44,10 @@
 	# 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 @@
 	        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)