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

release: bump version to 1.25.0 (development)

Browse source
This commit is contained in:
Beniamino Galvani 2020-04-10 18:08:10 +02:00
parent f80826fbb2
commit f2756b930e
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], [23])
m4_define([nm_micro_version], [90])
m4_define([nm_minor_version], [25])
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

@ -229,6 +229,20 @@
# define NM_AVAILABLE_IN_1_24
#endif
#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_26
# define NM_DEPRECATED_IN_1_26 G_DEPRECATED
# define NM_DEPRECATED_IN_1_26_FOR(f) G_DEPRECATED_FOR(f)
#else
# define NM_DEPRECATED_IN_1_26
# define NM_DEPRECATED_IN_1_26_FOR(f)
#endif
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_26
# define NM_AVAILABLE_IN_1_26 G_UNAVAILABLE(1,26)
#else
# define NM_AVAILABLE_IN_1_26
#endif
/*
* Synchronous API for calling D-Bus in libnm is deprecated. See
* https://developer.gnome.org/libnm/stable/usage.html#sync-api

2
meson.build
View file

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

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

@ -64,6 +64,7 @@
#define NM_VERSION_1_20 (NM_ENCODE_VERSION (1, 20, 0))
#define NM_VERSION_1_22 (NM_ENCODE_VERSION (1, 22, 0))
#define NM_VERSION_1_24 (NM_ENCODE_VERSION (1, 24, 0))
#define NM_VERSION_1_26 (NM_ENCODE_VERSION (1, 26, 0))
/* For releases, NM_API_VERSION is equal to NM_VERSION.
*