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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jan 21 23:38:07 2010
New Revision: 3395

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3395
Log:
Kill nm-system-settings on upgrades

* network-manager.postinst
  - Kill any running nm-system-settings daemon on upgrades before the new
    NetworkManager daemon is started. Its functionality has been merged
    into NetworkManager.

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

Modified: packages/experimental/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/changelog?rev=3395&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/changelog (original)
+++ packages/experimental/networkmanager/debian/changelog Thu Jan 21 23:38:07 2010
@@ -36,6 +36,10 @@
   * debian/network-manager.preinst
     - Remove the obsolete conffile
       /etc/dbus-1/system.d/nm-system-settings.conf on upgrades.
+  * network-manager.postinst
+    - Kill any running nm-system-settings daemon on upgrades before the new
+      NetworkManager daemon is started. Its functionality has been merged
+      into NetworkManager.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 29 Nov 2009 10:19:59 +0100
 

Modified: packages/experimental/networkmanager/debian/network-manager.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/network-manager.postinst?rev=3395&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/network-manager.postinst (original)
+++ packages/experimental/networkmanager/debian/network-manager.postinst Thu Jan 21 23:38:07 2010
@@ -47,8 +47,13 @@
 		done
 	fi
 
+	# Kill nm-system-settings service as in 0.8 it is no longer a separate process
+	if dpkg --compare-versions "$2" lt "0.7.998-1"; then
+		kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true
+	fi
+
 	;;
-    
+
     abort-upgrade|abort-deconfigure|abort-remove)
 	;;