release: bump version to 1.15.1-dev after 1.14.0 release

System Internals / NetworkManager - Thomas Haller [redhat.com] - 14 September 2018 19:30 EDT



###

release: bump version to 1.15.1-dev after 1.14.0 release

After 1.14.0 is released, merge it back into master so that
1.14.0 is part of the history of master. That means,
$ git log --first-parent master
will also traverse 1.14.0 and 1.14-rc*.

Also bump the micro version to 1.15.1-dev to indicate that this is
after 1.14.0 is out.


diff --cc configure.ac
index ff5d5f710,17ff1a6f6..c4a84cc4c
--- a/configure.ac
+++ b/configure.ac
@@@ -7,8 -7,8 +7,8 @@@ dnl - add corresponding NM_VERSION_x_y
dnl "shared/nm-version-macros.h.in"
dnl - update number in meson.build
m4_define([nm_major_version], [1])
- m4_define([nm_minor_version], [14])
- m4_define([nm_micro_version], [0])
+ m4_define([nm_minor_version], [15])
-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])

diff --cc meson.build
index da0e80094,d2cef289f..effaabec0
--- a/meson.build
+++ b/meson.build
@@@ -4,7 -4,7 +4,7 @@@ project
# - add corresponding NM_VERSION_x_y_z macros in
# "shared/nm-version-macros.h.in"
# - update number in configure.ac
- version: '1.14.0',
- version: '1.15.0',
++ version: '1.15.1',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',

30674675c release: bump version to 1.15.1-dev after 1.14.0 release

configure.ac | 4 ++--
libnm-core/nm-version.h | 14 ++++++++++++++
meson.build | 2 +-
shared/nm-version-macros.h.in | 1 +
4 files changed, 18 insertions(+), 3 deletions(-)

Upstream: cgit.freedesktop.org


  • Share