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, 85 deletions

diff --git a/src/nm-exported-object.h b/src/nm-exported-object.h
deleted file mode 100644
index 47559a20..00000000
--- a/src/nm-exported-object.h
+++ /dev/null
@@ -1,85 +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 2014 Red Hat, Inc.
- */
-
-#ifndef NM_EXPORTED_OBJECT_H
-#define NM_EXPORTED_OBJECT_H
-
-/*****************************************************************************/
-
-#define NM_EXPORT_PATH_NUMBERED(basepath) ""basepath"/%llu"
-
-char *nm_exported_object_skeletonify_method_name (const char *dbus_method_name);
-
-typedef struct {
-	GType dbus_skeleton_type;
-	char *method_name;
-	GCallback impl;
-} NMExportedObjectDBusMethodImpl;
-
-GDBusInterfaceSkeleton *nm_exported_object_skeleton_create (GType dbus_skeleton_type,
-                                                            GObjectClass *object_class,
-                                                            const NMExportedObjectDBusMethodImpl *methods,
-                                                            guint methods_len,
-                                                            GObject *target);
-void nm_exported_object_skeleton_release (GDBusInterfaceSkeleton *interface);
-
-/*****************************************************************************/
-
-#define NM_TYPE_EXPORTED_OBJECT            (nm_exported_object_get_type ())
-#define NM_EXPORTED_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_EXPORTED_OBJECT, NMExportedObject))
-#define NM_EXPORTED_OBJECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_EXPORTED_OBJECT, NMExportedObjectClass))
-#define NM_IS_EXPORTED_OBJECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_EXPORTED_OBJECT))
-#define NM_IS_EXPORTED_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_EXPORTED_OBJECT))
-#define NM_EXPORTED_OBJECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_EXPORTED_OBJECT, NMExportedObjectClass))
-
-#define NM_EXPORTED_OBJECT_PATH "path"
-
-struct _NMExportedObjectPrivate;
-
-struct _NMExportedObject {
-	GDBusObjectSkeleton parent;
-	struct _NMExportedObjectPrivate *_priv;
-};
-
-typedef struct {
-	GDBusObjectSkeletonClass parent;
-
-	const char *export_path;
-	char export_on_construction;
-} NMExportedObjectClass;
-
-GType nm_exported_object_get_type (void);
-
-void nm_exported_object_class_set_quitting  (void);
-
-void nm_exported_object_class_add_interface (NMExportedObjectClass *object_class,
-                                             GType                  dbus_skeleton_type,
-                                             ...) G_GNUC_NULL_TERMINATED;
-
-const char *nm_exported_object_export      (NMExportedObject *self);
-const char *nm_exported_object_get_path    (NMExportedObject *self);
-gboolean    nm_exported_object_is_exported (NMExportedObject *self);
-void        nm_exported_object_unexport    (NMExportedObject *self);
-GDBusInterfaceSkeleton *nm_exported_object_get_interface_by_type (NMExportedObject *self, GType interface_type);
-
-void        _nm_exported_object_clear_and_unexport (NMExportedObject **location);
-#define nm_exported_object_clear_and_unexport(location) _nm_exported_object_clear_and_unexport ((NMExportedObject **) (location))
-
-#endif /* NM_EXPORTED_OBJECT_H */