diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-02-23 10:15:56 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-02-23 10:15:58 +0100 |
| commit | a537e0dcce842506e36c8ed046765a5cd1d2daeb (patch) | |
| tree | c605f1e1a46f4c7e42bdcea6d051ef6dfc023527 | |
| parent | 11f02622aa03101bb4fa5e442a753cf42dc5fa21 (diff) | |
release: bump version to 1.17.0 (development)1.17.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 8ba7ce5fa3..865f2c28fb 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], [15]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [17]) +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 7fe2e45b59..0ac2955baa 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -188,4 +188,18 @@ # define NM_AVAILABLE_IN_1_16 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_18 +# define NM_DEPRECATED_IN_1_18 G_DEPRECATED +# define NM_DEPRECATED_IN_1_18_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_18 +# define NM_DEPRECATED_IN_1_18_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_18 +# define NM_AVAILABLE_IN_1_18 G_UNAVAILABLE(1,18) +#else +# define NM_AVAILABLE_IN_1_18 +#endif + #endif /* NM_VERSION_H */ diff --git a/meson.build b/meson.build index 7065bba53f..b375b9d407 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.15.90', + version: '1.17.0', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 22af1428be..4b57529a30 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -75,6 +75,7 @@ #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)) +#define NM_VERSION_1_18 (NM_ENCODE_VERSION (1, 18, 0)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * |