fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-31 18:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

release: bump version to 1.5.1-dev after 1.4.0 release

Browse source 
After 1.4.0 is released, merge it back into master so that
1.4.0 is part of the history of master. That means,
  $ git log --first-parent master
will also traverse 1.4.0 and 1.4.0-rc1.

Also, the closest branch parent of master and nm-1-4 branch
becomes 1.4.0 tag.

Also bump the micro version to 1.5.1-dev to indicate that this is
after 1.4.0 is out, otherwise `git describe` uses the 1.4.0 tag.
This commit is contained in:
Thomas Haller 2016-08-25 12:24:16 +02:00
commit 2a314557c7
4 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -2,8 +2,8 @@ AC_PREREQ([2.63])
dnl The NM version number
m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [4])
m4_define([nm_micro_version], [0])
m4_define([nm_minor_version], [5])
m4_define([nm_micro_version], [1])
m4_define([nm_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 ])])

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

@ -104,4 +104,18 @@
# define NM_AVAILABLE_IN_1_4
#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 */

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

@ -104,4 +104,18 @@
# define NM_AVAILABLE_IN_1_4
#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 */

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

@ -69,8 +69,9 @@
#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_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_NEXT_STABLE NM_VERSION_1_4
#define NM_VERSION_CUR_STABLE NM_VERSION_1_4
#define NM_VERSION_NEXT_STABLE NM_VERSION_1_6
#endif /* __NM_VERSION_MACROS_H__ */