diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index d27f441a..f1d8b08f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,6 @@ network-manager (1.10.4-1ubuntu1) UNRELEASED; urgency=medium + Depend on isc-dhcp-client instead of recommends + Recommend network-manager-pptp + Suggest avahi-autoipd for IPv4LL support - - debian/control, debian/rules: - + Disable team support since it's in universe - debian/rules, debian/network-manager.postinst: + Don't restart NetworkManager on upgrade but recommend restarting the computer @@ -45,6 +43,9 @@ network-manager (1.10.4-1ubuntu1) UNRELEASED; urgency=medium * Dropped patches applied in new release: - connectivity-allow-override.patch - nm1.10-connectivity-check-api.patch + * Other dropped changes: + - debian/control, debian/rules: + + Disable team support since it's in universe (LP: #1392012) -- Jeremy Bicha <jbicha@ubuntu.com> Thu, 08 Feb 2018 17:54:22 -0500 diff --git a/debian/control b/debian/control index 2128640c..dfbb87a6 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,7 @@ Build-Depends: debhelper (>= 10.3), libndp-dev, libreadline-dev, libnewt-dev (>= 0.52.15), -# libteam-dev (>= 1.9), + libteam-dev (>= 1.9), libjansson-dev, libbluetooth-dev (>= 5), valac (>= 0.17.1.24), @@ -72,7 +72,7 @@ Recommends: ppp, network-manager-pptp, crda, iputils-arping -Suggests: avahi-autoipd +Suggests: avahi-autoipd, libteam-utils Breaks: ${misc:Breaks} Description: network management framework (daemon and userspace tools) NetworkManager is a system network service that manages your network devices @@ -88,6 +88,9 @@ Description: network management framework (daemon and userspace tools) * avahi-autoipd: Used for IPv4LL, a protocol for automatic Link-Local IP address configuration. * ppp: Required for establishing dial-up connections (e.g. via GSM). + * libteam-utils: Network Team driver allows multiple network interfaces to be + teamed together and act like a single one. This process is called "ethernet + bonding", "channel teaming" or "link aggregation". Package: network-manager-dev Section: devel diff --git a/debian/rules b/debian/rules index 837a3ce9..119c2946 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ override_dh_auto_configure: --enable-introspection \ --enable-gtk-doc \ --enable-concheck \ - --disable-teamdctl \ + --enable-teamdctl \ --enable-json-validation \ --enable-bluez5-dun \ --enable-vala \ |