diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-09-14 21:30:15 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-09-14 21:30:15 +0200 |
| commit | 30674675cb00785d676c672488fde9e27c2c3df4 (patch) | |
| tree | 69bea835c7fcf17f74186efbd9d58a91bd467b34 | |
| parent | 2979c891c4af7584780924e92b6d448b7d6cd328 (diff) | |
| parent | 3b5912f08d1a813fff64ac0e3ef82f9b4fa37763 (diff) | |
| download | NetworkManager-30674675cb00785d676c672488fde9e27c2c3df4.tar.gz | |
release: bump version to 1.15.1-dev after 1.14.0 release1.15.1-dev
After 1.14.0 is released, merge it back into master so that
1.14.0 is part of the history of master. That means,
$ git log --first-parent master
will also traverse 1.14.0 and 1.14-rc*.
Also bump the micro version to 1.15.1-dev to indicate that this is
after 1.14.0 is out.
| -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 ff5d5f7100..c4a84cc4c6 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], [14]) -m4_define([nm_micro_version], [0]) +m4_define([nm_minor_version], [15]) +m4_define([nm_micro_version], [1]) 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 59482d4eeb..7fe2e45b59 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -174,4 +174,18 @@ # define NM_AVAILABLE_IN_1_14 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_16 +# define NM_DEPRECATED_IN_1_16 G_DEPRECATED +# define NM_DEPRECATED_IN_1_16_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_16 +# define NM_DEPRECATED_IN_1_16_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_16 +# define NM_AVAILABLE_IN_1_16 G_UNAVAILABLE(1,16) +#else +# define NM_AVAILABLE_IN_1_16 +#endif + #endif /* NM_VERSION_H */ diff --git a/meson.build b/meson.build index da0e800942..effaabec03 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.14.0', + version: '1.15.1', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 6f2a186779..22af1428be 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -74,6 +74,7 @@ #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)) +#define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * |