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, 0 insertions, 93 deletions

diff --git a/src/nm-bus-manager.h b/src/nm-bus-manager.h
deleted file mode 100644
index 153f7cdc..00000000
--- a/src/nm-bus-manager.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2006 - 2008 Red Hat, Inc.
- * Copyright (C) 2006 - 2008 Novell, Inc.
- */
-
-#ifndef __NM_BUS_MANAGER_H__
-#define __NM_BUS_MANAGER_H__
-
-#define NM_TYPE_BUS_MANAGER (nm_bus_manager_get_type ())
-#define NM_BUS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_BUS_MANAGER, NMBusManager))
-#define NM_BUS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NM_TYPE_BUS_MANAGER, NMBusManagerClass))
-#define NM_IS_BUS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_BUS_MANAGER))
-#define NM_IS_BUS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_BUS_MANAGER))
-#define NM_BUS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_BUS_MANAGER, NMBusManagerClass))
-
-#define NM_BUS_MANAGER_DBUS_CONNECTION_CHANGED          "dbus-connection-changed"
-#define NM_BUS_MANAGER_PRIVATE_CONNECTION_NEW           "private-connection-new"
-#define NM_BUS_MANAGER_PRIVATE_CONNECTION_DISCONNECTED  "private-connection-disconnected"
-
-typedef struct _NMBusManagerClass NMBusManagerClass;
-
-GType nm_bus_manager_get_type (void);
-
-NMBusManager * nm_bus_manager_get       (void);
-void           nm_bus_manager_setup     (NMBusManager *instance);
-
-gboolean nm_bus_manager_start_service    (NMBusManager *self);
-
-GDBusConnection * nm_bus_manager_get_connection (NMBusManager *self);
-
-gboolean nm_bus_manager_get_caller_info (NMBusManager *self,
-                                         GDBusMethodInvocation *context,
-                                         char **out_sender,
-                                         gulong *out_uid,
-                                         gulong *out_pid);
-
-gboolean nm_bus_manager_ensure_uid (NMBusManager          *self,
-                                    GDBusMethodInvocation *context,
-                                    gulong uid,
-                                    GQuark error_domain,
-                                    int error_code);
-
-const char *nm_bus_manager_connection_get_private_name (NMBusManager *self,
-                                                        GDBusConnection *connection);
-
-gboolean nm_bus_manager_get_unix_user (NMBusManager *self,
-                                       const char *sender,
-                                       gulong *out_uid);
-
-gboolean nm_bus_manager_get_caller_info_from_message (NMBusManager *self,
-                                                      GDBusConnection *connection,
-                                                      GDBusMessage *message,
-                                                      char **out_sender,
-                                                      gulong *out_uid,
-                                                      gulong *out_pid);
-
-void nm_bus_manager_register_object (NMBusManager *self,
-                                     GDBusObjectSkeleton *object);
-
-void nm_bus_manager_unregister_object (NMBusManager *self,
-                                       GDBusObjectSkeleton *object);
-
-GDBusObjectSkeleton *nm_bus_manager_get_registered_object (NMBusManager *self,
-                                                           const char *path);
-
-void nm_bus_manager_private_server_register (NMBusManager *self,
-                                             const char *path,
-                                             const char *tag);
-
-GDBusProxy *nm_bus_manager_new_proxy (NMBusManager *self,
-                                      GDBusConnection *connection,
-                                      GType proxy_type,
-                                      const char *name,
-                                      const char *path,
-                                      const char *iface);
-
-#endif /* __NM_BUS_MANAGER_H__ */