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

2 files changed, 9 insertions, 6 deletions

diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build
index 1c817163..47d64bdd 100644
--- a/examples/C/glib/meson.build
+++ b/examples/C/glib/meson.build
@@ -14,6 +14,6 @@ foreach example: examples
     example[0],
     [example[0] + '.c'] + example[1],
     include_directories: example[2],
-    dependencies: [nm_core_dep] + example[3],
+    dependencies: [libnm_core_dep] + example[3],
   )
 endforeach
diff --git a/examples/nm-conf.d/31-mac-addr-change.conf b/examples/nm-conf.d/31-mac-addr-change.conf
index 554b698f..f32507a1 100644
--- a/examples/nm-conf.d/31-mac-addr-change.conf
+++ b/examples/nm-conf.d/31-mac-addr-change.conf
@@ -5,12 +5,15 @@
 #
 # https://bugzilla.gnome.org/show_bug.cgi?id=777523
 [device-31-mac-addr-change]
-match-device=driver:rtl8723bs,driver:rtl8189es,driver:r8188eu,driver:eagle_sdio
+match-device=driver:eagle_sdio,driver:wl
 wifi.scan-rand-mac-address=no
 
 [connection-31-mac-addr-change]
-match-device=driver:rtl8723bs,driver:rtl8189es,driver:r8188eu,driver:eagle_sdio
-# these are per-profile properties. Here we overwrite the default
-# value, but explicitly configuring it in the profile takes precedence.
+# These are defaults for the connection profile. Here we set only the default
+# value. Note that the default value already should be "preserve", so this has
+# no actual effect.
+#
+# Also note that this is only the default. Per-profile settings still take
+# precedence.
+match-device=driver:eagle_sdio,driver:wl
 wifi.cloned-mac-address=preserve
-ethernet.cloned-mac-address=preserve