Import Debian changes 1.12.2-0ubuntu3

network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium

  * debian/rules:
    - use --with-libnm-glib, the default reversed since that's a legacy
      library but we still need it for unity-control-center

network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium

  * debian/patches/git-newglib-test.patch:
    - backport upstream commit to fix the tests with the new glib 

network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium

  * New upstream version
  * d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
    d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
    d/p/git_thunderbolt_connect.patch:
    - removed, those changes are in the new version
  * Backport Debian changes
  * Update symbols file for libnm0
  * Enable iwd support
  * Drop version requirements when oldstable ships a newer version
  * Drop dh_strip override, the dbgsym migration is done
  * Rebase patches
  * Make sure the example server.conf is actually installed
  * Update install path for plugins, it now includes a version number
  * Drop libnl3 build dependency.
    Upstream has copied the code directly from libnl3 for the few functions it
    needs with a few small modifications.
  * Drop libiw build dependency.
    Hasn't been needed for a long time and was simply a left over from older
    releases.
  * Bump Standards-Version to 4.1.5
  * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)

1 files changed, 10 insertions, 13 deletions

diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c
index fee6fc9f..ec554e6c 100644
--- a/libnm-glib/nm-vpn-plugin-ui-interface.c
+++ b/libnm-glib/nm-vpn-plugin-ui-interface.c
@@ -69,7 +69,6 @@ interface_init (gpointer g_iface)
 	initialized = TRUE;
 }
 
-
 GType
 nm_vpn_plugin_ui_interface_get_type (void)
 {
@@ -78,13 +77,13 @@ nm_vpn_plugin_ui_interface_get_type (void)
 	if (!vpn_plugin_ui_interface_type) {
 		const GTypeInfo vpn_plugin_ui_interface_info = {
 			sizeof (NMVpnPluginUiInterface), /* class_size */
-			interface_init,   /* base_init */
-			NULL,		/* base_finalize */
+			interface_init, /* base_init */
+			NULL, /* base_finalize */
 			NULL,
-			NULL,		/* class_finalize */
-			NULL,		/* class_data */
+			NULL, /* class_finalize */
+			NULL, /* class_data */
 			0,
-			0,              /* n_preallocs */
+			0,    /* n_preallocs */
 			NULL
 		};
 
@@ -99,7 +98,6 @@ nm_vpn_plugin_ui_interface_get_type (void)
 	return vpn_plugin_ui_interface_type;
 }
 
-
 NMVpnPluginUiWidgetInterface *
 nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
                                        NMConnection *connection,
@@ -167,7 +165,6 @@ nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface,
 	return TRUE;
 }
 
-
 static void
 widget_interface_init (gpointer g_iface)
 {
@@ -197,13 +194,13 @@ nm_vpn_plugin_ui_widget_interface_get_type (void)
 	if (!vpn_plugin_ui_widget_interface_type) {
 		const GTypeInfo vpn_plugin_ui_widget_interface_info = {
 			sizeof (NMVpnPluginUiWidgetInterface), /* class_size */
-			widget_interface_init,   /* base_init */
-			NULL,		/* base_finalize */
+			widget_interface_init, /* base_init */
+			NULL, /* base_finalize */
 			NULL,
-			NULL,		/* class_finalize */
-			NULL,		/* class_data */
+			NULL, /* class_finalize */
+			NULL, /* class_data */
 			0,
-			0,              /* n_preallocs */
+			0,    /* n_preallocs */
 			NULL
 		};