libnm: fix versioning on new APIs, bump sonamedanw/versioning-bgo742993

The newly added bond mode APIs in nm-utils will be new in 1.2, so mark
them as such in the headers and docs, move them to a new section in
libnm.ver.

Since we're adding the new section to libnm.ver, this also seems like
a good time to bump the soname.

4 files changed, 15 insertions, 6 deletions

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index f55a7dac03..6ced0937f3 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -3238,8 +3238,9 @@ static BondMode bond_mode_table[] = {
  * available modes.
  *
  * Returns: bonding mode string, or NULL on error
-*/
-
+ *
+ * Since: 1.2
+ */
 const char *
 nm_utils_bond_mode_int_to_string (int mode)
 {
@@ -3258,7 +3259,9 @@ nm_utils_bond_mode_int_to_string (int mode)
  * The @mode string can be either a descriptive name or a number (as string).
  *
  * Returns: numeric bond mode, or -1 on error
-*/
+ *
+ * Since: 1.2
+ */
 int
 nm_utils_bond_mode_string_to_int (const char *mode)
 {
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index 7393040696..727f000568 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -185,7 +185,9 @@ gboolean nm_utils_ipaddr_valid (int family, const char *ip);
 
 gboolean nm_utils_check_virtual_device_compatibility (GType virtual_type, GType other_type);
 
+NM_AVAILABLE_IN_1_2
 int nm_utils_bond_mode_string_to_int (const char *mode);
+NM_AVAILABLE_IN_1_2
 const char *nm_utils_bond_mode_int_to_string (int mode);
 
 G_END_DECLS
diff --git a/libnm/Makefile.am b/libnm/Makefile.am
index e8915b4268..2c9d94ef54 100644
--- a/libnm/Makefile.am
+++ b/libnm/Makefile.am
@@ -130,7 +130,7 @@ libnm_la_LIBADD = \
 SYMBOL_VIS_FILE=$(srcdir)/libnm.ver
 
 libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
-	-version-info "0:0:0"
+	-version-info "1:0:1"
 
 ###
 
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 322d553560..aba84f4a83 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -754,8 +754,6 @@ global:
 	nm_state_get_type;
 	nm_utils_ap_mode_security_valid;
 	nm_utils_bin2hexstr;
-	nm_utils_bond_mode_int_to_string;
-	nm_utils_bond_mode_string_to_int;
 	nm_utils_check_virtual_device_compatibility;
 	nm_utils_escape_ssid;
 	nm_utils_file_is_certificate;
@@ -846,3 +844,9 @@ global:
 local:
 	*;
 };
+
+libnm_1_2_0 {
+global:
+	nm_utils_bond_mode_int_to_string;
+	nm_utils_bond_mode_string_to_int;
+} libnm_1_0_0;