Import Debian changes 1.18.0-1ubuntu1

network-manager (1.18.0-1ubuntu1) eoan; urgency=medium

  * Update to 1.18, merge on Debian, new version includes nwe support for
    policy routing rules and for VLAN filtering for Linux bridge.
  * Remaining Ubuntu changes
    - Use systemd-resolved instead of dnsmasq
    - debian/control:
      + Depend on isc-dhcp-client instead of recommends
      + Recommend network-manager-pptp
      + Suggest avahi-autoipd for IPv4LL support
    - debian/rules, debian/network-manager.postinst:
      + Don't restart NetworkManager on upgrade but recommend restarting
        the computer
    - debian/rules, debian/network-manager.postinst:
      + Don't install sysvinit scripts or migrate from sysvinit
    - debian/network-manager.postinst:
      + Don't add the netdev group.
      + drop in an empty override file for NetworkManager to manage all
        devices for upgrade from any version, as long as there is no
        netplan configuration yet.
    - debian/default-wifi-powersave-on.conf, debian/rules:
      + Install a config file to enable WiFi powersave
    - Enable build tests
    - Add autopkgtests
    - debian/source_network-manager.py, debian/network-manager.install,
      debian/network-manager.links: Add apport hook
    - Add network-manager-config-connectivity-ubuntu package
    - NetworkManager.conf: disable MAC randomization feature. There is no
      easy way for desktop users to disable this feature yet. And there are
      reports that it doesn't work well with some systems.
    - Update Vcs links to point to Ubuntu branch
    - Add patches. See patch descriptions for more details:
      + Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
      + Update-dnsmasq-parameters.patch
      + Disable-general-with-expect.patch
      + libnm-Check-self-still-NMManager-or-not.patch
      + 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.
  * Removed delta, not needed anymore
    - debian/network-manager.maintscript
      + Remove /etc/dbus-1/system.d/nm-ofono.conf

4 files changed, 5 insertions, 5 deletions

diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build
index 3882d59a..5f08141e 100644
--- a/libnm-glib/meson.build
+++ b/libnm-glib/meson.build
@@ -5,7 +5,7 @@ dbus_binding_tool = find_program('dbus-binding-tool')
 common_deps = [
   dbus_dep,
   dbus_glib_dep,
-  shared_nm_utils_base_dep,
+  shared_nm_glib_aux_dep,
 ]
 
 common_cflags = [
@@ -196,7 +196,7 @@ libnm_glib = shared_library(
   dependencies: common_deps + [
     libnm_util_dep,
     libudev_dep,
-    shared_nm_utils_udev_dep,
+    shared_nm_udev_aux_dep,
   ],
   c_args: cflags,
   link_whole: libdeprecated_nm_glib,
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 16fee714..8f1524e3 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "nm-utils.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index 6179b757..e9b3b30f 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -26,7 +26,7 @@
 
 #include "NetworkManager.h"
 
-#include "nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-adsl.h"
 #include "nm-device-wifi.h"
diff --git a/libnm-glib/tests/meson.build b/libnm-glib/tests/meson.build
index 7d6007cb..de74f3b2 100644
--- a/libnm-glib/tests/meson.build
+++ b/libnm-glib/tests/meson.build
@@ -3,7 +3,7 @@ deps = [
   dbus_glib_dep,
   libnm_glib_dep,
   libnm_util_dep,
-  shared_nm_utils_base_dep,
+  shared_nm_glib_aux_dep,
 ]
 
 test_units = [