From 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 4 Jun 2018 00:07:45 +0200 Subject: New upstream version 1.11.4 --- shared/nm-version-macros.h | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'shared/nm-version-macros.h') diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index 2ef9960b..2a37c26d 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -37,7 +37,7 @@ * Evaluates to the minor version number of NetworkManager which this source * is compiled against. */ -#define NM_MINOR_VERSION (10) +#define NM_MINOR_VERSION (11) /** * NM_MICRO_VERSION: @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (8) +#define NM_MICRO_VERSION (4) /** * NM_CHECK_VERSION: @@ -72,13 +72,25 @@ #define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0)) #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_10_2 (NM_ENCODE_VERSION (1, 10, 2)) -#define NM_VERSION_1_10_4 (NM_ENCODE_VERSION (1, 10, 4)) -#define NM_VERSION_1_10_6 (NM_ENCODE_VERSION (1, 10, 6)) -#define NM_VERSION_1_10_8 (NM_ENCODE_VERSION (1, 10, 8)) +#define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_8 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_8 +/* For releases, NM_API_VERSION is equal to NM_VERSION. + * + * For development builds, NM_API_VERSION is the next + * stable API after NM_VERSION. When you run a development + * version, you are already using the future API, even if + * it is not yet release. Hence, the currently used API + * version is the future one. */ +#define NM_API_VERSION \ + (((NM_MINOR_VERSION % 2) == 1) \ + ? NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION + 1, 0 ) \ + : NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION , ((NM_MICRO_VERSION + 1) / 2) * 2)) + +/* deprecated. */ +#define NM_VERSION_CUR_STABLE NM_API_VERSION + +/* deprecated. */ +#define NM_VERSION_NEXT_STABLE NM_API_VERSION #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) -- cgit 1.3.0-6-gf8a5 From 069cb5c3a525ebcc19cc2927964258acaca87b13 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 17 Jun 2018 14:54:10 +0200 Subject: New upstream version 1.11.90 --- shared/nm-version-macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared/nm-version-macros.h') diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index 2a37c26d..7dcd068c 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (4) +#define NM_MICRO_VERSION (90) /** * NM_CHECK_VERSION: -- cgit 1.3.0-6-gf8a5 From 429393567647935d9123e21fd27a7529d50255eb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 1 Jul 2018 20:58:23 +0200 Subject: New upstream version 1.12.0 --- shared/nm-version-macros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shared/nm-version-macros.h') diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index 7dcd068c..06936567 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -37,7 +37,7 @@ * Evaluates to the minor version number of NetworkManager which this source * is compiled against. */ -#define NM_MINOR_VERSION (11) +#define NM_MINOR_VERSION (12) /** * NM_MICRO_VERSION: @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (90) +#define NM_MICRO_VERSION (0) /** * NM_CHECK_VERSION: -- cgit 1.3.0-6-gf8a5 From caf1db9d6fbc056cc6c76a24574890f6c7895f3d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 25 Jul 2018 13:12:18 +0200 Subject: New upstream version 1.12.2 --- shared/nm-version-macros.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'shared/nm-version-macros.h') diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index 06936567..350858e2 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (0) +#define NM_MICRO_VERSION (2) /** * NM_CHECK_VERSION: @@ -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. * -- cgit 1.3.0-6-gf8a5