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

diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index 60dbe7d7..7b0513bb 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -182,6 +182,13 @@
       The following variables are available for the use in the dispatcher scripts:
       <variablelist class="dispatcher-environment">
         <varlistentry>
+          <term><varname>NM_DISPATCHER_ACTION</varname></term>
+          <listitem><para>
+            The dispatcher action like "up" or "dhcp4-change", identical to the first
+            command line argument. Since NetworkManager 1.12.0.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>CONNECTION_UUID</varname></term>
           <listitem><para>
             The UUID of the connection profile.
@@ -376,9 +383,9 @@
         <term><option>--plugins</option></term>
         <listitem><para>List plugins used to manage system-wide
         connection settings.  This list has preference over plugins
-        specified in the configuration file.  Currently supported
-        plugins are: keyfile, <option>ifcfg-rh</option>,
-        <option>ifcfg-suse</option>, <option>ifupdown</option>.
+        specified in the configuration file.  See <literal>main.plugins</literal>
+        setting in <link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>
+        for supported options.
         </para></listitem>
       </varlistentry>
       <varlistentry>