diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-28 16:30:25 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-28 16:34:22 +0200 |
| commit | 1fcb3b40c24d57a76e376c3bdb58f5b43e1f9b55 (patch) | |
| tree | 2724c42fcc666693ae3a5a77b9cb63ec411c18b6 | |
| parent | aac581d4ec0ebd843e099f4fc6d0b591ef242a1c (diff) | |
release: bump version to 1.9.0 (development)1.9.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 ab884de314..f3cef711c9 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], [7]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [9]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index c6cd28924c..f6bfaf720c 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -132,4 +132,18 @@ # define NM_AVAILABLE_IN_1_8 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_10 +# define NM_DEPRECATED_IN_1_10 G_DEPRECATED +# define NM_DEPRECATED_IN_1_10_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_10 +# define NM_DEPRECATED_IN_1_10_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_10 +# define NM_AVAILABLE_IN_1_10 G_UNAVAILABLE(1,10) +#else +# define NM_AVAILABLE_IN_1_10 +#endif + #endif /* NM_VERSION_H */ diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h index d4c66ea011..7173bc6ba3 100644 --- a/libnm-util/nm-version.h +++ b/libnm-util/nm-version.h @@ -132,4 +132,18 @@ # define NM_AVAILABLE_IN_1_8 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_10 +# define NM_DEPRECATED_IN_1_10 G_DEPRECATED +# define NM_DEPRECATED_IN_1_10_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_10 +# define NM_DEPRECATED_IN_1_10_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_10 +# define NM_AVAILABLE_IN_1_10 G_UNAVAILABLE(1,10) +#else +# define NM_AVAILABLE_IN_1_10 +#endif + #endif /* NM_VERSION_H */ diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 43ba668604..c39f26045e 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -71,9 +71,10 @@ #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_1_8 (NM_ENCODE_VERSION (1, 8, 0)) +#define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_6 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_8 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_8 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) |