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.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3395 ceb527fc-18e6-0310-9fe2-813c157c29e7

2 files changed, 10 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 5ad5ad3c..7834e807 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,10 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low
   * 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@debian.org>  Sun, 29 Nov 2009 10:19:59 +0100
 
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index f91886f5..f5b2cdda 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -47,8 +47,13 @@ case "$1" in
 		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)
 	;;