diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-07-29 20:56:14 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-07-29 20:56:15 +0200 |
| commit | 0dd087e4b672125f793e2c4b164bc857c16b5298 (patch) | |
| tree | cd99dc3c4101126b0351c4994f8451750cac0549 | |
| parent | e5912389c66d5545cd35e5497dee75933b1dcfb5 (diff) | |
release: bump version to 1.21.0 (development)1.21.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 86aac8a920..194fd0d6d8 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], [19]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [21]) +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 ee6a1e7db7..bb5b5422f6 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -215,4 +215,18 @@ # define NM_AVAILABLE_IN_1_20 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_22 +# define NM_DEPRECATED_IN_1_22 G_DEPRECATED +# define NM_DEPRECATED_IN_1_22_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_22 +# define NM_DEPRECATED_IN_1_22_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_22 +# define NM_AVAILABLE_IN_1_22 G_UNAVAILABLE(1,22) +#else +# define NM_AVAILABLE_IN_1_22 +#endif + #endif /* NM_VERSION_H */ diff --git a/meson.build b/meson.build index e0e560c620..01b1d15ff2 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.19.90', + version: '1.21.0', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index a546b1009a..eed928242e 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -76,6 +76,7 @@ #define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0)) #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)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * |