Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jonathan Kang
NetworkManager
Commits
57cfc6f1
Commit
57cfc6f1
authored
Sep 08, 2018
by
Thomas Haller
Browse files
release: bump version to 1.15.0 (development)
parent
16ad82f9
Changes
4
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
57cfc6f1
...
...
@@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in
dnl "shared/nm-version-macros.h.in"
dnl - update number in meson.build
m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [1
3
])
m4_define([nm_micro_version], [
9
0])
m4_define([nm_minor_version], [1
5
])
m4_define([nm_micro_version], [0])
m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version])
...
...
libnm-core/nm-version.h
View file @
57cfc6f1
...
...
@@ -174,4 +174,18 @@
# define NM_AVAILABLE_IN_1_14
#endif
#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_16
# define NM_DEPRECATED_IN_1_16 G_DEPRECATED
# define NM_DEPRECATED_IN_1_16_FOR(f) G_DEPRECATED_FOR(f)
#else
# define NM_DEPRECATED_IN_1_16
# define NM_DEPRECATED_IN_1_16_FOR(f)
#endif
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_16
# define NM_AVAILABLE_IN_1_16 G_UNAVAILABLE(1,16)
#else
# define NM_AVAILABLE_IN_1_16
#endif
#endif
/* NM_VERSION_H */
meson.build
View file @
57cfc6f1
...
...
@@ -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.1
3.9
0'
,
version
:
'1.1
5.
0'
,
license
:
'GPL2+'
,
default_options
:
[
'buildtype=debugoptimized'
,
...
...
shared/nm-version-macros.h.in
View file @
57cfc6f1
...
...
@@ -74,6 +74,7 @@
#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_14 (NM_ENCODE_VERSION (1, 14, 0))
#define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0))
/* For releases, NM_API_VERSION is equal to NM_VERSION.
*
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment