release: bump version to 1.25.0 (development)

System Internals / NetworkManager - Beniamino Galvani [redhat.com] - 10 April 2020 16:08 UTC



###

diff --git a/configure.ac b/configure.ac
index 9e511cd78..5e8dca24a 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], [23])
-m4_define([nm_micro_version], [90])
+m4_define([nm_minor_version], [25])
+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 195fc1968..203840376 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -229,6 +229,20 @@
# define NM_AVAILABLE_IN_1_24
#endif

+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_26
+# define NM_DEPRECATED_IN_1_26 G_DEPRECATED
+# define NM_DEPRECATED_IN_1_26_FOR(f) G_DEPRECATED_FOR(f)
+#else
+# define NM_DEPRECATED_IN_1_26
+# define NM_DEPRECATED_IN_1_26_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_26
+# define NM_AVAILABLE_IN_1_26 G_UNAVAILABLE(1,26)
+#else
+# define NM_AVAILABLE_IN_1_26
+#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 301ff2045..9946e2677 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project(
# - add corresponding NM_VERSION_x_y_z macros in
# "shared/nm-version-macros.h.in"
# - update number in configure.ac
- version: '1.23.90',
+ version: '1.25.0',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index e97f506cb..83da86ce1 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -64,6 +64,7 @@
#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))
+#define NM_VERSION_1_26 (NM_ENCODE_VERSION (1, 26, 0))

/* For releases, NM_API_VERSION is equal to NM_VERSION.
*

f2756b930 release: bump version to 1.25.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(-)

Upstream: cgit.freedesktop.org


  • Share