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

diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index 61bfa5b1..ee6dbc0b 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -29,17 +29,17 @@
 
 #if !defined (NM_VERSION_MIN_REQUIRED) || (NM_VERSION_MIN_REQUIRED == 0)
 # undef NM_VERSION_MIN_REQUIRED
-# define NM_VERSION_MIN_REQUIRED (NM_VERSION_CUR_STABLE)
+# define NM_VERSION_MIN_REQUIRED (NM_API_VERSION)
 #endif
 
 #if !defined (NM_VERSION_MAX_ALLOWED) || (NM_VERSION_MAX_ALLOWED == 0)
 # undef NM_VERSION_MAX_ALLOWED
-# define NM_VERSION_MAX_ALLOWED (NM_VERSION_CUR_STABLE)
+# define NM_VERSION_MAX_ALLOWED (NM_API_VERSION)
 #endif
 
 /* sanity checks */
-#if NM_VERSION_MIN_REQUIRED > NM_VERSION_NEXT_STABLE
-#error "NM_VERSION_MIN_REQUIRED must be <= NM_VERSION_NEXT_STABLE"
+#if NM_VERSION_MIN_REQUIRED > NM_API_VERSION
+#error "NM_VERSION_MIN_REQUIRED must be <= NM_API_VERSION"
 #endif
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_MIN_REQUIRED
 #error "NM_VERSION_MAX_ALLOWED must be >= NM_VERSION_MIN_REQUIRED"
@@ -146,10 +146,24 @@
 # define NM_AVAILABLE_IN_1_10
 #endif
 
-#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_10_2
-# define NM_AVAILABLE_IN_1_10_2          G_UNAVAILABLE(1,10.2)
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_12
+# define NM_DEPRECATED_IN_1_12           G_DEPRECATED
+# define NM_DEPRECATED_IN_1_12_FOR(f)    G_DEPRECATED_FOR(f)
 #else
-# define NM_AVAILABLE_IN_1_10_2
+# define NM_DEPRECATED_IN_1_12
+# define NM_DEPRECATED_IN_1_12_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12
+# define NM_AVAILABLE_IN_1_12            G_UNAVAILABLE(1,12)
+#else
+# define NM_AVAILABLE_IN_1_12
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2
+# define NM_AVAILABLE_IN_1_12_2          G_UNAVAILABLE(1,12,2)
+#else
+# define NM_AVAILABLE_IN_1_12_2
 #endif
 
 #endif  /* NM_VERSION_H */