Use dh_installinit -R instead of -r and stopping manually in postinst.

3 files changed, 2 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 988f97a2..d8f6f4cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ network-manager (0.8.3.999-1) UNRELEASED; urgency=low
 
   * New upstream release (0.8.4 rc2).
   * Update debian/watch, switch to bzip2.
+  * Use dh_installinit -R instead of -r and stopping manually in postinst.
 
  -- Michael Biebl <biebl@debian.org>  Mon, 04 Apr 2011 22:37:21 +0200
 
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index 87fee6ea..52bcd0ac 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -41,14 +41,6 @@ case "$1" in
             invoke-rc.d dbus force-reload || true
         fi
 
-        # Stop the service on upgrades before it is started again.
-        # dh_installinit -r will create the start code.
-        if [ -n "$2" ]; then
-            if [ -x "/etc/init.d/network-manager" ]; then
-                invoke-rc.d network-manager stop || true
-            fi
-        fi
-
         # Update init script priorities
         if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then
             for i in 0 1 6 ; do
diff --git a/debian/rules b/debian/rules
index 5139d15e..ccaa90f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ override_dh_install:
 		debian/network-manager/usr/lib/NetworkManager
 
 override_dh_installinit:
-	dh_installinit -pnetwork-manager -r -- start 26 2 3 4 5 . stop 88 0 1 6 .
+	dh_installinit -pnetwork-manager -R -- start 26 2 3 4 5 . stop 88 0 1 6 .
 
 override_dh_makeshlibs:
 	dh_makeshlibs -X/usr/lib/NetworkManager/ -X/usr/lib/pppd/