From 0c06a0f3687672a227c934a30d56f306e925f8b1 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 29 Nov 2019 15:46:22 +0100
Subject: release: bump version to 1.23.0 (development)

---
 configure.ac                  |  4 ++--
 libnm-core/nm-version.h       | 14 ++++++++++++++
 meson.build                   |  2 +-
 shared/nm-version-macros.h.in |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 82f64b729a..12e1663e36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,8 @@ dnl  - add corresponding NM_VERSION_x_y_z macros in
 dnl    "shared/nm-version-macros.h.in"
 dnl  - update number in meson.build
 m4_define([nm_major_version], [1])
-m4_define([nm_minor_version], [21])
-m4_define([nm_micro_version], [90])
+m4_define([nm_minor_version], [23])
+m4_define([nm_micro_version], [0])
 m4_define([nm_version],
           [nm_major_version.nm_minor_version.nm_micro_version])
 
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index 3180c7e26a..e8a94db648 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -215,6 +215,20 @@
 # define NM_AVAILABLE_IN_1_22
 #endif
 
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_24
+# define NM_DEPRECATED_IN_1_24           G_DEPRECATED
+# define NM_DEPRECATED_IN_1_24_FOR(f)    G_DEPRECATED_FOR(f)
+#else
+# define NM_DEPRECATED_IN_1_24
+# define NM_DEPRECATED_IN_1_24_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_24
+# define NM_AVAILABLE_IN_1_24            G_UNAVAILABLE(1,24)
+#else
+# define NM_AVAILABLE_IN_1_24
+#endif
+
 /*
  * Synchronous API for calling D-Bus in libnm is deprecated. See
  * https://developer.gnome.org/libnm/stable/usage.html#sync-api
diff --git a/meson.build b/meson.build
index 13a5ae1648..495529ec9a 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "shared/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.21.90',
+  version: '1.23.0',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index 961febb027..e97f506cb8 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -63,6 +63,7 @@
 #define NM_VERSION_1_18   (NM_ENCODE_VERSION (1, 18, 0))
 #define NM_VERSION_1_20   (NM_ENCODE_VERSION (1, 20, 0))
 #define NM_VERSION_1_22   (NM_ENCODE_VERSION (1, 22, 0))
+#define NM_VERSION_1_24   (NM_ENCODE_VERSION (1, 24, 0))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
-- 
cgit v1.2.3