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

diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build
new file mode 100644
index 00000000..7baf09f8
--- /dev/null
+++ b/docs/libnm/meson.build
@@ -0,0 +1,52 @@
+doc_module = libnm_name
+
+private_headers = [
+  'common.h',
+  'crypto.h',
+  'nm-dbus-helpers.h',
+  'nm-core-internal.h',
+  'nm-core-types-internal.h',
+  'nm-device-private.h',
+  'nm-dhcp4-config.h',
+  'nm-dhcp6-config.h',
+  'nm-dns-manager.h',
+  'nm-ip4-config.h',
+  'nm-ip6-config.h',
+  'nm-manager.h',
+  'nm-object-private.h',
+  'nm-property-compare.h',
+  'nm-remote-connection-private.h',
+  'nm-remote-settings.h',
+  'nm-setting-private.h',
+  'nm-utils-private.h',
+  'nm-core-tests-enum-types.h',
+  'nm-keyfile-internal.h',
+  'nm-keyfile-utils.h',
+  'test-general-enums.h'
+]
+
+configure_file(
+  input: version_xml + '.in',
+  output: version_xml,
+  configuration: version_conf
+)
+
+gnome.gtkdoc(
+  doc_module,
+  main_xml: doc_module + '-docs.xml',
+  src_dir: [
+    libnm_core_inc,
+    libnm_inc
+  ],
+  dependencies: libnm_dep,
+  scan_args: [
+    '--rebuild-types',
+    '--rebuild-sections',
+    '--ignore-headers=' + ' '.join(private_headers)
+  ],
+  scanobjs_args: '--type-init-func="g_type_init();"',
+  fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
+  gobject_typesfile: doc_module + '.types',
+  html_assets: doc_module + '.png',
+  install: true
+)