about summary refs log tree commit diff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJeremy Bicha <jbicha@ubuntu.com>2018-02-08 18:04:05 -0500
committerJeremy Bicha <jbicha@ubuntu.com>2018-02-08 18:06:39 -0500
commitf49f65596ccd79b5d0ba34a5feda8d25f08f1fef (patch)
tree6e9e76dc8ef4962af938927d3ae19b25a28aa6cf /debian/changelog
parentf1c906035c6ea7eb635664835c153aed553dc2e5 (diff)
Revert "Disable team support since it's in universe"
This reverts commit 773fa460187c30b4d4f9271b075a92dadb57c1fb.

https://launchpad.net/bugs/1392012
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog5
1 files changed, 3 insertions, 2 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