release: bump version to 1.5.1-dev after 1.4.0 release

System Internals / NetworkManager - Thomas Haller [redhat.com] - 25 August 2016 07:58 UTC



###

release: bump version to 1.5.1-dev after 1.4.0 release

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.


diff --cc configure.ac
index 8659fdc,bfaa5ff..31f38fd
--- a/configure.ac
+++ b/configure.ac
@@@ -2,8 -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], [0])
++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 ])])

2a31455 release: bump version to 1.5.1-dev after 1.4.0 release

configure.ac | 4 ++--
libnm-core/nm-version.h | 14 ++++++++++++++
libnm-util/nm-version.h | 14 ++++++++++++++
shared/nm-version-macros.h.in | 5 +++--
4 files changed, 33 insertions(+), 4 deletions(-)

Upstream: cgit.freedesktop.org

  • Share