about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-10-16 22:09:41 +0200
committerMichael Biebl <biebl@debian.org>2016-10-16 22:16:06 +0200
commitf0ffa34f249359717b3db8ebc6b008a96000ead4 (patch)
treefac0b935e9c16109c5ae2d7f04f1def5855fe789
parent4b593826685219c23f8def8f95851333567e53e5 (diff)
Do not (re)start NetworkManager-dispatcher.service
Do not (re)start NetworkManager-dispatcher.service as part of the
upgrade process. This was an unintended side-effect of switching to
debhelper compat level 10.

NOTE: --no-also is necessary, because NetworkManager.service contains

[Install]
Also=NetworkManager-dispatcher.service

Closes: #839884
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/rules2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 415b1a3a..a8c5a686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 network-manager (1.4.2-2) UNRELEASED; urgency=medium
 
   * Drop Build-Depends on dh-systemd, no longer necessary with debhelper 10.
+  * Do not (re)start NetworkManager-dispatcher.service as part of the upgrade
+    process. This was an unintended side-effect of switching to debhelper
+    compat level 10. (Closes: #839884)
 
  -- Michael Biebl <biebl@debian.org>  Sun, 16 Oct 2016 21:57:42 +0200
 
diff --git a/debian/rules b/debian/rules
index e5734a63..dda6e3ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ override_dh_strip:
 override_dh_systemd_start:
 	dh_link lib/systemd/system/NetworkManager.service \
 		lib/systemd/system/network-manager.service
-	dh_systemd_start -pnetwork-manager NetworkManager.service
+	dh_systemd_start -pnetwork-manager --no-also NetworkManager.service
 
 override_dh_ppp:
 	dh_ppp --breaks