summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-06-29 17:17:59 +0200
committerThomas Haller <thaller@redhat.com>2018-06-29 17:18:00 +0200
commitae6661fdcebe392d8392dadb2a543b7b6c8b9431 (patch)
tree936b292d4bffd46f3a2eaf814445d27a4170fd40
parent8964dbe8bc9cbe7300a48bffe86faee6b149fbf2 (diff)
release: bump version to 1.12.1 (development)1.12.1-dev
-rw-r--r--configure.ac2
-rw-r--r--meson.build2
-rw-r--r--shared/nm-version-macros.h.in1
3 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 97fe1b7c24..f99e3c9d1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl "shared/nm-version-macros.h.in"
dnl - update number in meson.build
m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [12])
-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 --git a/meson.build b/meson.build
index 6877f15f9e..c80945d49c 100644
--- a/meson.build
+++ b/meson.build
@@ -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.12.0',
+ version: '1.12.1',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index 8d07fc82ba..0d8fa87af4 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -73,6 +73,7 @@
#define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0))
#define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0))
#define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0))
+#define NM_VERSION_1_12_2 (NM_ENCODE_VERSION (1, 12, 2))
/* For releases, NM_API_VERSION is equal to NM_VERSION.
*