fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-04 12:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

release: bump version to 1.21.0 (development)

Browse source
This commit is contained in:
Thomas Haller 2019-07-29 20:56:14 +02:00
parent e5912389c6
commit 0dd087e4b6
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -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])

14
libnm-core/nm-version.h
View file

@ -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 */

2
meson.build
View file

@ -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',

1
shared/nm-version-macros.h.in
View file

@ -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.
*