Import Debian changes 1.12.2-0ubuntu3

network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium

  * debian/rules:
    - use --with-libnm-glib, the default reversed since that's a legacy
      library but we still need it for unity-control-center

network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium

  * debian/patches/git-newglib-test.patch:
    - backport upstream commit to fix the tests with the new glib 

network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium

  * New upstream version
  * d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
    d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
    d/p/git_thunderbolt_connect.patch:
    - removed, those changes are in the new version
  * Backport Debian changes
  * Update symbols file for libnm0
  * Enable iwd support
  * Drop version requirements when oldstable ships a newer version
  * Drop dh_strip override, the dbgsym migration is done
  * Rebase patches
  * Make sure the example server.conf is actually installed
  * Update install path for plugins, it now includes a version number
  * Drop libnl3 build dependency.
    Upstream has copied the code directly from libnl3 for the few functions it
    needs with a few small modifications.
  * Drop libiw build dependency.
    Hasn't been needed for a long time and was simply a left over from older
    releases.
  * Bump Standards-Version to 4.1.5
  * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)

1 files changed, 11 insertions, 11 deletions

diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch
index 3c1acc31..d80cf672 100644
--- a/debian/patches/Update-dnsmasq-parameters.patch
+++ b/debian/patches/Update-dnsmasq-parameters.patch
@@ -10,11 +10,11 @@ See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolv
  src/dns/nm-dns-manager.c | 6 +++---
  2 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
-index e6436c7..09a968c 100644
---- a/src/dns/nm-dns-dnsmasq.c
-+++ b/src/dns/nm-dns-dnsmasq.c
-@@ -504,8 +504,8 @@ start_dnsmasq (NMDnsDnsmasq *self)
+Index: network-manager-1.12.2/src/dns/nm-dns-dnsmasq.c
+===================================================================
+--- network-manager-1.12.2.orig/src/dns/nm-dns-dnsmasq.c
++++ network-manager-1.12.2/src/dns/nm-dns-dnsmasq.c
+@@ -330,8 +330,8 @@ start_dnsmasq (NMDnsDnsmasq *self)
  	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
  	argv[idx++] = "--bind-interfaces";
  	argv[idx++] = "--pid-file=" PIDFILE;
@@ -25,11 +25,11 @@ index e6436c7..09a968c 100644
  	argv[idx++] = "--clear-on-reload"; /* clear cache when dns server changes */
  	argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */
  	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
-diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
-index dc54547..b3ded33 100644
---- a/src/dns/nm-dns-manager.c
-+++ b/src/dns/nm-dns-manager.c
-@@ -1082,12 +1082,12 @@ update_dns (NMDnsManager *self,
+Index: network-manager-1.12.2/src/dns/nm-dns-manager.c
+===================================================================
+--- network-manager-1.12.2.orig/src/dns/nm-dns-manager.c
++++ network-manager-1.12.2/src/dns/nm-dns-manager.c
+@@ -1426,12 +1426,12 @@ update_dns (NMDnsManager *self,
  		;
  	}
  
@@ -44,7 +44,7 @@ index dc54547..b3ded33 100644
  
  		if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
  			/* systemd-resolved uses a different link-local address */
-@@ -1448,7 +1448,7 @@ nm_dns_manager_stop (NMDnsManager *self)
+@@ -1756,7 +1756,7 @@ nm_dns_manager_stop (NMDnsManager *self)
  	_LOGT ("stopping...");
  
  	/* If we're quitting, leave a valid resolv.conf in place, not one