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

release: bump version to 1.17.0 (development)

Browse source
This commit is contained in:
Thomas Haller 2019-02-23 10:15:56 +01:00
parent 11f02622aa
commit a537e0dcce
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 "shared/nm-version-macros.h.in"
dnl - update number in meson.build dnl - update number in meson.build
m4_define([nm_major_version], [1]) m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [15]) m4_define([nm_minor_version], [17])
m4_define([nm_micro_version], [90]) m4_define([nm_micro_version], [0])
m4_define([nm_version], m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version]) [nm_major_version.nm_minor_version.nm_micro_version])

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

@ -188,4 +188,18 @@
# define NM_AVAILABLE_IN_1_16 # define NM_AVAILABLE_IN_1_16
#endif #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 */ #endif /* NM_VERSION_H */

2
meson.build
View file

@ -4,7 +4,7 @@ project(
# - add corresponding NM_VERSION_x_y_z macros in # - add corresponding NM_VERSION_x_y_z macros in
# "shared/nm-version-macros.h.in" # "shared/nm-version-macros.h.in"
# - update number in configure.ac # - update number in configure.ac
version: '1.15.90', version: '1.17.0',
license: 'GPL2+', license: 'GPL2+',
default_options: [ default_options: [
'buildtype=debugoptimized', 'buildtype=debugoptimized',

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

@ -75,6 +75,7 @@
#define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 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_14 (NM_ENCODE_VERSION (1, 14, 0))
#define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 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. /* For releases, NM_API_VERSION is equal to NM_VERSION.
* *