diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-08-17 15:49:17 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-08-17 16:20:42 +0200 |
| commit | b2eb64a4390e1d565a3193c7fe076b295670e577 (patch) | |
| tree | 68d7d21312f0011ca166c2ab717238285c846b21 | |
| parent | cb6f1f57517ef47f40876a39865392cff57cc2d7 (diff) | |
| download | NetworkManager-b2eb64a4390e1d565a3193c7fe076b295670e577.tar.gz | |
release: bump version to 1.5.0 (development)1.5.0-dev
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libnm-core/nm-version.h | 14 | ||||
| -rw-r--r-- | libnm-util/nm-version.h | 14 | ||||
| -rw-r--r-- | shared/nm-version-macros.h.in | 5 |
4 files changed, 33 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index fd768a1c38..bfaa5ff552 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [3]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [5]) +m4_define([nm_micro_version], [0]) 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/libnm-core/nm-version.h b/libnm-core/nm-version.h index d7f112bf93..aa92c3f813 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -104,4 +104,18 @@ # define NM_AVAILABLE_IN_1_4 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_6 +# define NM_DEPRECATED_IN_1_6 G_DEPRECATED +# define NM_DEPRECATED_IN_1_6_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_6 +# define NM_DEPRECATED_IN_1_6_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_6 +# define NM_AVAILABLE_IN_1_6 G_UNAVAILABLE(1,6) +#else +# define NM_AVAILABLE_IN_1_6 +#endif + #endif /* NM_VERSION_H */ diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h index 760151a68f..b8b32306e0 100644 --- a/libnm-util/nm-version.h +++ b/libnm-util/nm-version.h @@ -104,4 +104,18 @@ # define NM_AVAILABLE_IN_1_4 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_6 +# define NM_DEPRECATED_IN_1_6 G_DEPRECATED +# define NM_DEPRECATED_IN_1_6_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_6 +# define NM_DEPRECATED_IN_1_6_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_6 +# define NM_AVAILABLE_IN_1_6 G_UNAVAILABLE(1,6) +#else +# define NM_AVAILABLE_IN_1_6 +#endif + #endif /* NM_VERSION_H */ diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index d67aab4cc7..bc76812793 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -69,8 +69,9 @@ #define NM_VERSION_1_0 (NM_ENCODE_VERSION (1, 0, 0)) #define NM_VERSION_1_2 (NM_ENCODE_VERSION (1, 2, 0)) #define NM_VERSION_1_4 (NM_ENCODE_VERSION (1, 4, 0)) +#define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_2 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_4 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_4 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_6 #endif /* __NM_VERSION_MACROS_H__ */ |