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, 3 insertions, 3 deletions

diff --git a/TODO b/TODO
index 86fef82b..566bbd5a 100644
--- a/TODO
+++ b/TODO
@@ -19,7 +19,7 @@ The first is the largest obstacle, but ideally we implement this and enable it
 when we have the required glib and libsoup versions available.  One other
 complication is that this checking should be done during the
 NM_DEVICE_STATE_IP_CHECK phase (along with other operations like WiFi hotspot
-auto-login) while the current checks are done globally in nm-manager.c, so 
+auto-login) while the current checks are done globally in nm-manager.c, so
 keeping both code paths might be complex.
 
 But ideally, once the device has successfully gotten an IPv4 or IPv6 address, it
@@ -38,7 +38,7 @@ based on it and the device's state.
 
 To allow for "pre-down" scenarios, this state should be implemented before a
 device is taken down while it still has connectivity.  If the device is
-taken down because it's ethernet carrier was dropped, or because the WiFi
+taken down because its ethernet carrier was dropped, or because the WiFi
 connection was terminated by the supplicant, this state is pointless and should
 be skipped.  But if the user requested a manual "disconnect", or NM is dropping
 connections on exit, etc, then this state should be entered.  In the future
@@ -235,7 +235,7 @@ proceeds with the connection.
 
 NM sends the correct wpa_supplicant config for WPS to the supplicant, and waits
 for the connection to occur.  WPS can only be used the *first* time, so after a
-first successfull connection, NM must request the actual hexadecimal PSK from 
+first successfull connection, NM must request the actual hexadecimal PSK from
 wpa_supplicant via D-Bus, and store that PSK in the connection, clear any WPS
 PIN code from the connection, and save the connection to backing storage.