release: bump version to 1.15.0 (development)

System Internals / NetworkManager - Thomas Haller [redhat.com] - 8 September 2018 08:24 EDT



###

diff --git a/configure.ac b/configure.ac
index 67b1ecd6f..d53335ac2 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], [13])
-m4_define([nm_micro_version], [90])
+m4_define([nm_minor_version], [15])
+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 59482d4ee..7fe2e45b5 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -174,4 +174,18 @@
# define NM_AVAILABLE_IN_1_14
#endif

+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_16
+# define NM_DEPRECATED_IN_1_16 G_DEPRECATED
+# define NM_DEPRECATED_IN_1_16_FOR(f) G_DEPRECATED_FOR(f)
+#else
+# define NM_DEPRECATED_IN_1_16
+# define NM_DEPRECATED_IN_1_16_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_16
+# define NM_AVAILABLE_IN_1_16 G_UNAVAILABLE(1,16)
+#else
+# define NM_AVAILABLE_IN_1_16
+#endif
+
#endif /* NM_VERSION_H */
diff --git a/meson.build b/meson.build
index 00e958e59..9374136f7 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.13.90',
+ version: '1.15.0',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index 6f2a18677..22af1428b 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -74,6 +74,7 @@
#define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0))
#define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0))
#define NM_VERSION_1_14 (NM_ENCODE_VERSION (1, 14, 0))
+#define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0))

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

57cfc6f19 release: bump version to 1.15.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