diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-15 17:05:58 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-06-15 17:16:18 +0200 |
| commit | fb9edd5eddfd69a8c6eb5d1ad32b24cc33a3cb5d (patch) | |
| tree | 3c9c3c5e14c3a52bc696fc8a4da4c43c0e22cca7 | |
| parent | e0d7e2933432bcf3f2c421b242084552b6783b95 (diff) | |
release: bump version to 1.13.0 (development)1.13.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 641af9bfc0..2812a19f07 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], [11]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [13]) +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 0412bc8e94..59482d4eeb 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -160,4 +160,18 @@ # define NM_AVAILABLE_IN_1_12 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_14 +# define NM_DEPRECATED_IN_1_14 G_DEPRECATED +# define NM_DEPRECATED_IN_1_14_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_14 +# define NM_DEPRECATED_IN_1_14_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_14 +# define NM_AVAILABLE_IN_1_14 G_UNAVAILABLE(1,14) +#else +# define NM_AVAILABLE_IN_1_14 +#endif + #endif /* NM_VERSION_H */ diff --git a/meson.build b/meson.build index 7ef55362b2..bca1f40c23 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.11.90', + version: '1.13.0', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 8d07fc82ba..6f2a186779 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -73,6 +73,7 @@ #define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0)) #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)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * |