Drop dependency on avahi-autoipd

Native IPv4 link-local addressing configuration based on systemd network
library is now used instead.

3 files changed, 3 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 4c5874de..d8280b74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ network-manager (1.1.90-1) UNRELEASED; urgency=medium
   * Explicitly enable nmcli.
   * Set the path to the dnssec-trigger-script via the configure switch.
   * Rebase patches.
+  * Drop dependency on avahi-autoipd. Native IPv4 link-local addressing
+    configuration based on systemd network library is now used instead.
 
  -- Michael Biebl <biebl@debian.org>  Wed, 20 Jan 2016 16:28:12 +0100
 
diff --git a/debian/control b/debian/control
index 92526821..af52fab2 100644
--- a/debian/control
+++ b/debian/control
@@ -61,8 +61,7 @@ Recommends: ppp,
             modemmanager,
             crda,
             iputils-arping
-Suggests: avahi-autoipd,
-          libteam-utils
+Suggests: libteam-utils
 Breaks: ${misc:Breaks}
 Description: network management framework (daemon and userspace tools)
  NetworkManager is a system network service that manages your network devices
@@ -78,7 +77,6 @@ Description: network management framework (daemon and userspace tools)
   * ppp: Required for establishing dial-up connections (e.g. via GSM).
   * dnsmasq-base/iptables: Required for creating Ad-hoc connections and
     connection sharing.
-  * avahi-autoipd: Used for IPv4LL, a protocol for automatic Link-Local IP
     address configuration.
   * libteam-utils: Network Team driver allows multiple network interfaces to be
     teamed together and act like a single one. This process is called "ethernet
diff --git a/debian/network-manager.install b/debian/network-manager.install
index 6c170627..81c482e5 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -5,7 +5,6 @@ usr/bin/nmtui*
 usr/lib/NetworkManager/nm-dhcp-helper
 usr/lib/NetworkManager/nm-iface-helper
 usr/lib/NetworkManager/nm-dispatcher
-usr/lib/NetworkManager/nm-avahi-autoipd.action
 usr/lib/*/NetworkManager/libnm-settings-plugin-ifupdown.so
 usr/lib/*/NetworkManager/libnm-settings-plugin-ibft.so
 usr/lib/*/NetworkManager/libnm-device-plugin-*.so
@@ -18,7 +17,6 @@ usr/share/polkit-1/
 usr/share/bash-completion/
 etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
 etc/dbus-1/system.d/nm-dispatcher.conf
-etc/dbus-1/system.d/nm-avahi-autoipd.conf
 etc/NetworkManager/dispatcher.d/
 lib/udev/rules.d/*.rules
 lib/systemd/system/NetworkManager.service