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, 20 insertions, 2 deletions

diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 0002f8ee..625c3d57 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -192,13 +192,16 @@
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Modem.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.OvsInterface.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.OvsPort.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Ppp.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Team.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Tun.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Veth.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vlan.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wireless.xml"/>
-      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/>
     </chapter>
 
@@ -239,10 +242,25 @@
       <xi:include href="dbus-org.freedesktop.NetworkManager.AccessPoint.xml"/>
     </chapter>
 
+    <chapter id="ref-dbus-checkpoint">
+      <title>The <literal>/org/freedesktop/NetworkManager/Checkpoint/*</literal> objects</title>
+      <!-- TODO: Describe the objects here -->
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Checkpoint.xml"/>
+    </chapter>
+
     <chapter id="dbus-types">
       <title>Types</title>
       <xi:include href="../../libnm-core/nm-dbus-types.xml"/>
     </chapter>
+
+    <!--
+      These are obsolete and intentionally ommitted from the manual since they can't
+      appear on the D-Bus API of the present version of NetworkManager.
+      Keep them here so that "make check" won't think that they were skipped accidentally .
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.WiMax.Nsp.xml"/>
+    -->
+
   </part>
 
   <part id="secret-agents">
@@ -258,7 +276,7 @@
   <part id="vpn-plugins">
     <title>VPN Plugin D-Bus API Reference</title>
 
-    <chapter id="dbus-vpn-types">
+    <chapter id="dbus-vpn-plugin">
       <title>VPN services</title>
       <!-- TODO: Describe the VPN services here -->
       <xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml"/>