Use dh_instalinits' restart-on-upgrade option.

* debian/rules
  - Use new dh_installinit "-R" (restart-after-upgrade) option.
* debian/rsyslog.postinst
  - Remove our custom code to stop/start rsyslog on upgrades. This is done
    now automatically by dh_installinit.

3 files changed, 6 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 234d06d..22a807d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,11 @@ rsyslog (3.20.4-1) UNRELEASED; urgency=low
     - Bump to debhelper v7 compat mode.
   * debian/control
     - Bump debhelper build dependency to (>= 7.0.9).
-
+  * debian/rules
+    - Use new dh_installinit "-R" (restart-after-upgrade) option.
+  * debian/rsyslog.postinst
+    - Remove our custom code to stop/start rsyslog on upgrades. This is done
+      now automatically by dh_installinit.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 10 Feb 2009 01:52:32 +0100
 
diff --git a/debian/rsyslog.postinst b/debian/rsyslog.postinst
index 6f8b8a2..5ca3d3b 100644
--- a/debian/rsyslog.postinst
+++ b/debian/rsyslog.postinst
@@ -66,14 +66,6 @@ case "$1" in
 			fi
 		done
 	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/rsyslog" ]; then
-			invoke-rc.d rsyslog stop || true
-		fi
-	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/rules b/debian/rules
index 8c48176..9fb0847 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,7 +110,7 @@ binary-arch: build install
 	dh_installexamples
 	dh_install
 	dh_installlogrotate
-	dh_installinit -r -- start 10 2 3 4 5 . start 30 0 6 . stop 90 1 .
+	dh_installinit -R -- start 10 2 3 4 5 . start 30 0 6 . stop 90 1 .
 	dh_installman
 	dh_installdebconf
 	dh_link