diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-13 18:53:14 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-13 18:54:31 +0200 |
| commit | 8849edbd64a948c038a857e27eec535fec601d75 (patch) | |
| tree | e7c29aabc4d1a8425bc30c2ff900e6b36dba1781 | |
| parent | 5d804fcba71294858d19d88e288157954f2b3813 (diff) | |
release: bump version to 1.19.0 (development)1.19.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 e1ca1717f8..8ea25f4142 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], [17]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [19]) +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 0ac2955baa..189efe8249 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -202,4 +202,18 @@ # define NM_AVAILABLE_IN_1_18 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_20 +# define NM_DEPRECATED_IN_1_20 G_DEPRECATED +# define NM_DEPRECATED_IN_1_20_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_20 +# define NM_DEPRECATED_IN_1_20_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_20 +# define NM_AVAILABLE_IN_1_20 G_UNAVAILABLE(1,20) +#else +# define NM_AVAILABLE_IN_1_20 +#endif + #endif /* NM_VERSION_H */ diff --git a/meson.build b/meson.build index aa32046f53..f2718e06c6 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.17.90', + version: '1.19.0', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 4b57529a30..49b6308c88 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -76,6 +76,7 @@ #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)) +#define NM_VERSION_1_20 (NM_ENCODE_VERSION (1, 20, 0)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * |