summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-12-23 14:59:08 +0100
committerLubomir Rintel <lkundrak@v3.sk>2015-12-23 14:59:08 +0100
commitc163759fe463d1f4e1f4f8599c7ff3e4b537fe0d (patch)
treed6c589c70affed1ece59670fcf23748ab9228773
parent7f58a83a8c22c599de16a58472be6b39be563c9c (diff)
release: bump version to 1.0.101.0.10
-rw-r--r--configure.ac2
-rw-r--r--include/nm-version-macros.h.in5
-rw-r--r--libnm-core/nm-version.h6
-rw-r--r--libnm-util/nm-version.h6
4 files changed, 4 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index 98cfcb0af2..1ed693543a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
dnl The NM version number
m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [0])
-m4_define([nm_micro_version], [9])
+m4_define([nm_micro_version], [10])
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 ])])
diff --git a/include/nm-version-macros.h.in b/include/nm-version-macros.h.in
index 92df50baa9..0051e00551 100644
--- a/include/nm-version-macros.h.in
+++ b/include/nm-version-macros.h.in
@@ -72,8 +72,9 @@
#define NM_VERSION_1_0_6 (NM_ENCODE_VERSION (1, 0, 6))
#define NM_VERSION_1_0_8 (NM_ENCODE_VERSION (1, 0, 8))
#define NM_VERSION_1_0_10 (NM_ENCODE_VERSION (1, 0, 10))
+#define NM_VERSION_1_0_12 (NM_ENCODE_VERSION (1, 0, 12))
-#define NM_VERSION_CUR_STABLE NM_VERSION_1_0_8
-#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_10
+#define NM_VERSION_CUR_STABLE NM_VERSION_1_0_10
+#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_12
#endif /* __NM_VERSION_MACROS_H__ */
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index 5f3a8c941f..730330ab39 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -88,10 +88,4 @@
# define NM_AVAILABLE_IN_1_0_6
#endif
-#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0_8
-# define NM_AVAILABLE_IN_1_0_8 G_UNAVAILABLE(1,0.8)
-#else
-# define NM_AVAILABLE_IN_1_0_8
-#endif
-
#endif /* NM_VERSION_H */
diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h
index 689550997c..63895ddacc 100644
--- a/libnm-util/nm-version.h
+++ b/libnm-util/nm-version.h
@@ -88,10 +88,4 @@
# define NM_AVAILABLE_IN_1_0_6
#endif
-#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0_8
-# define NM_AVAILABLE_IN_1_0_8 G_UNAVAILABLE(1,0.8)
-#else
-# define NM_AVAILABLE_IN_1_0_8
-#endif
-
#endif /* NM_VERSION_H */