about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorIain Lane <iain.lane@canonical.com>2018-10-03 09:37:13 +0100
committerIain Lane <iain.lane@canonical.com>2018-10-03 09:37:13 +0100
commit5716d0a8c5b38df77583ad21a2f369939b92da0a (patch)
treeed92da86811a644d3605a96acd2fa2d53ac598b3 /debian
parentac82e803c0bdedb6040d116bfa2c31bc4da6458e (diff)
Update changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index a110fb29..2c67cf02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,8 +37,11 @@ network-manager (1.12.4-1ubuntu1) UNRELEASED; urgency=medium
       + dns-manager-don-t-merge-split-DNS-search-domains.patch (but disabled)
       + Read-system-connections-from-run.patch
     - debian/tests/urfkill-integration - don't stop/start network manager
+  * Revert "Add Conflicts to network-manager-dev against deprecated libraries"
+    This reverts commit b4acc5e03e2b821e1cccc69529bb70826c741942.  We're still
+    building libnm-glib for now, so these packages have a use in Ubuntu.
 
- -- Iain Lane <iain.lane@canonical.com>  Wed, 03 Oct 2018 09:27:59 +0100
+ -- Iain Lane <iain.lane@canonical.com>  Wed, 03 Oct 2018 09:37:01 +0100
 
 network-manager (1.12.4-1) unstable; urgency=medium