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

diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h
index ac18fe94..cc0b7330 100644
--- a/clients/common/nm-client-utils.h
+++ b/clients/common/nm-client-utils.h
@@ -30,9 +30,9 @@ typedef enum {
 	NMC_TRI_STATE_UNKNOWN,
 } NMCTriStateValue;
 
-const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error);
+const NMObject **nmc_objects_sort_by_path (const NMObject *const*objs, gssize len);
 
-char **nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens);
+const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error);
 
 gboolean nmc_string_to_uint (const char *str,
                              gboolean range_check,
@@ -44,7 +44,7 @@ gboolean nmc_string_to_tristate (const char *str, NMCTriStateValue *val, GError
 
 gboolean matches (const char *cmd, const char *pattern);
 
-/* FIXME: don't expose this function on it's own, at least not from this file. */
+/* FIXME: don't expose this function on its own, at least not from this file. */
 const char *nmc_bond_validate_mode (const char *mode, GError **error);
 
 const char *nm_active_connection_state_reason_to_string (NMActiveConnectionStateReason reason);
@@ -56,4 +56,8 @@ NMActiveConnectionState nmc_activation_get_effective_state (NMActiveConnection *
                                                             NMDevice *device,
                                                             const char **reason);
 
+const char *nmc_wifi_strength_bars (guint8 strength);
+
+const char *nmc_password_subst_char (void);
+
 #endif /* __NM_CLIENT_UTILS_H__ */