about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-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 0d6261cd..ea8e3531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 network-manager (1.1.90-2) UNRELEASED; urgency=medium
 
   * Update debian/copyright.
+  * Clean up obsolete /etc/dbus-1/system.d/nm-avahi-autoipd.conf conffile on
+    upgrades.
 
  -- Michael Biebl <biebl@debian.org>  Thu, 21 Jan 2016 18:08:37 +0100
 
diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript
index a33b2403..ac5ad5ef 100644
--- a/debian/network-manager.maintscript
+++ b/debian/network-manager.maintscript
@@ -2,3 +2,4 @@ mv_conffile /etc/dbus-1/system.d/NetworkManager.conf /etc/dbus-1/system.d/org.fr
 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
+rm_conffile /etc/dbus-1/system.d/nm-avahi-autoipd.conf 1.1.90-2~