about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-07-10 02:30:12 +0200
committerMichael Biebl <biebl@debian.org>2014-07-10 02:44:34 +0200
commitd973ffcbeb86874acbfe6338ebcb7668cd3c1716 (patch)
tree3bbde13494f1a93876fe2230d801efc476d321c6
parentd35815d482779b83521a93d800c349e4f38661e3 (diff)
Remove the obsolete /etc/dbus-1/system.d/nm-dhcp-client.conf conffile on upgrades.
-rw-r--r--debian/changelog2
-rw-r--r--debian/network-manager.maintscript1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6b7ca95d..0287ec4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ network-manager (0.9.10.0-1) UNRELEASED; urgency=medium
   * Stop installing the nm-dhcp-client.conf D-Bus policy. NetworkManager uses
     a private D-Bus socket now to communicate with that helper, making that
     file obsolete.
+  * Remove the obsolete /etc/dbus-1/system.d/nm-dhcp-client.conf conffile on
+    upgrades.
 
  -- Michael Biebl <biebl@debian.org>  Sun, 06 Jul 2014 03:04:21 +0200
 
diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript
index f480f995..a33b2403 100644
--- a/debian/network-manager.maintscript
+++ b/debian/network-manager.maintscript
@@ -1,3 +1,4 @@
 mv_conffile /etc/dbus-1/system.d/NetworkManager.conf /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 0.9.4.0-1~ network-manager
 rm_conffile /etc/polkit-1/localauthority/10-vendor.d/org.freedesktop.NetworkManager.pkla 0.9.8.8-4~ network-manager
 rm_conffile /etc/polkit-1/rules.d/60-network-manager.rules 0.9.8.8-4~ network-manager
+rm_conffile /etc/dbus-1/system.d/nm-dhcp-client.conf 0.9.10.0-1~ network-manager