diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2020-04-10 18:08:10 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2020-04-10 18:08:10 +0200 |
| commit | f2756b930ed6688347f583638100f3bd7d7fad58 (patch) | |
| tree | da7b35220a71084a30b0e1d81bcf578c6a520276 | |
| parent | f80826fbb22f191a15c7bf813c83cad7a38a9f39 (diff) | |
release: bump version to 1.25.0 (development)1.25.0-dev
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libnm-core/nm-version.h | 14 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | shared/nm-version-macros.h.in | 1 |
4 files changed, 18 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 9e511cd78a..5e8dca24a5 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 195fc19684..203840376e 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 301ff20458..9946e26779 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 e97f506cb8..83da86ce10 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. * |