mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 20:45:32 +00:00
release: bump version to 1.5.0 (development)
This commit is contained in:
parent
cb6f1f5751
commit
b2eb64a439
|
@ -2,8 +2,8 @@ AC_PREREQ([2.63])
|
||||||
|
|
||||||
dnl The NM version number
|
dnl The NM version number
|
||||||
m4_define([nm_major_version], [1])
|
m4_define([nm_major_version], [1])
|
||||||
m4_define([nm_minor_version], [3])
|
m4_define([nm_minor_version], [5])
|
||||||
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])
|
||||||
m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
|
m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
|
||||||
|
|
|
@ -104,4 +104,18 @@
|
||||||
# define NM_AVAILABLE_IN_1_4
|
# define NM_AVAILABLE_IN_1_4
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_6
|
||||||
|
# define NM_DEPRECATED_IN_1_6 G_DEPRECATED
|
||||||
|
# define NM_DEPRECATED_IN_1_6_FOR(f) G_DEPRECATED_FOR(f)
|
||||||
|
#else
|
||||||
|
# define NM_DEPRECATED_IN_1_6
|
||||||
|
# define NM_DEPRECATED_IN_1_6_FOR(f)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_6
|
||||||
|
# define NM_AVAILABLE_IN_1_6 G_UNAVAILABLE(1,6)
|
||||||
|
#else
|
||||||
|
# define NM_AVAILABLE_IN_1_6
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* NM_VERSION_H */
|
#endif /* NM_VERSION_H */
|
||||||
|
|
|
@ -104,4 +104,18 @@
|
||||||
# define NM_AVAILABLE_IN_1_4
|
# define NM_AVAILABLE_IN_1_4
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_6
|
||||||
|
# define NM_DEPRECATED_IN_1_6 G_DEPRECATED
|
||||||
|
# define NM_DEPRECATED_IN_1_6_FOR(f) G_DEPRECATED_FOR(f)
|
||||||
|
#else
|
||||||
|
# define NM_DEPRECATED_IN_1_6
|
||||||
|
# define NM_DEPRECATED_IN_1_6_FOR(f)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_6
|
||||||
|
# define NM_AVAILABLE_IN_1_6 G_UNAVAILABLE(1,6)
|
||||||
|
#else
|
||||||
|
# define NM_AVAILABLE_IN_1_6
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* NM_VERSION_H */
|
#endif /* NM_VERSION_H */
|
||||||
|
|
|
@ -69,8 +69,9 @@
|
||||||
#define NM_VERSION_1_0 (NM_ENCODE_VERSION (1, 0, 0))
|
#define NM_VERSION_1_0 (NM_ENCODE_VERSION (1, 0, 0))
|
||||||
#define NM_VERSION_1_2 (NM_ENCODE_VERSION (1, 2, 0))
|
#define NM_VERSION_1_2 (NM_ENCODE_VERSION (1, 2, 0))
|
||||||
#define NM_VERSION_1_4 (NM_ENCODE_VERSION (1, 4, 0))
|
#define NM_VERSION_1_4 (NM_ENCODE_VERSION (1, 4, 0))
|
||||||
|
#define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0))
|
||||||
|
|
||||||
#define NM_VERSION_CUR_STABLE NM_VERSION_1_2
|
#define NM_VERSION_CUR_STABLE NM_VERSION_1_4
|
||||||
#define NM_VERSION_NEXT_STABLE NM_VERSION_1_4
|
#define NM_VERSION_NEXT_STABLE NM_VERSION_1_6
|
||||||
|
|
||||||
#endif /* __NM_VERSION_MACROS_H__ */
|
#endif /* __NM_VERSION_MACROS_H__ */
|
||||||
|
|
Loading…
Reference in a new issue