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

diff --git a/libnm/meson.build b/libnm/meson.build
new file mode 100644
index 00000000..76c77d0c
--- /dev/null
+++ b/libnm/meson.build
@@ -0,0 +1,277 @@
+libnm_inc = include_directories('.')
+
+sources = files('nm-libnm-utils.c')
+
+deps = [
+  libnmdbus_dep,
+  shared_dep
+]
+
+cflags = [
+  '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
+]
+
+if have_fake_typelibs
+  deps += gir_dep
+  subdir('fake-typelib')
+endif
+
+libnm_utils = static_library(
+  'nm-utils',
+  sources: sources,
+  include_directories: libnm_core_inc,
+  dependencies: deps,
+  c_args: cflags
+)
+
+libnm_headers = files(
+  'NetworkManager.h',
+  'nm-access-point.h',
+  'nm-active-connection.h',
+  'nm-autoptr.h',
+  'nm-checkpoint.h',
+  'nm-client.h',
+  'nm-device-adsl.h',
+  'nm-device-bond.h',
+  'nm-device-bridge.h',
+  'nm-device-bt.h',
+  'nm-device-dummy.h',
+  'nm-device-ethernet.h',
+  'nm-device-generic.h',
+  'nm-device.h',
+  'nm-device-infiniband.h',
+  'nm-device-ip-tunnel.h',
+  'nm-device-macsec.h',
+  'nm-device-macvlan.h',
+  'nm-device-modem.h',
+  'nm-device-olpc-mesh.h',
+  'nm-device-ovs-interface.h',
+  'nm-device-ovs-port.h',
+  'nm-device-ovs-bridge.h',
+  'nm-device-ppp.h',
+  'nm-device-team.h',
+  'nm-device-tun.h',
+  'nm-device-vlan.h',
+  'nm-device-vxlan.h',
+  'nm-device-wifi.h',
+  'nm-device-wimax.h',
+  'nm-dhcp-config.h',
+  'nm-ip-config.h',
+  'nm-object.h',
+  'nm-remote-connection.h',
+  'nm-secret-agent-old.h',
+  'nm-types.h',
+  'nm-vpn-connection.h',
+  'nm-vpn-editor.h',
+  'nm-vpn-plugin-old.h',
+  'nm-vpn-service-plugin.h',
+  'nm-wimax-nsp.h'
+)
+
+install_headers(
+  libnm_core_headers + libnm_headers + [version_header],
+  subdir: libnm_name
+)
+
+enum_headers = libnm_headers + [version_header]
+enum_types = 'nm-enum-types'
+
+libnm_enum = gnome.mkenums(
+  enum_types,
+  sources: enum_headers,
+  identifier_prefix: nm_id_prefix,
+  c_template: enum_types + '.c.template',
+  h_template: enum_types + '.h.template',
+  install_header: true,
+  install_dir: libnm_pkgincludedir
+)
+
+libnm_sources = files(
+  'nm-access-point.c',
+  'nm-active-connection.c',
+  'nm-checkpoint.c',
+  'nm-client.c',
+  'nm-dbus-helpers.c',
+  'nm-device-adsl.c',
+  'nm-device-bond.c',
+  'nm-device-bridge.c',
+  'nm-device-bt.c',
+  'nm-device.c',
+  'nm-device-dummy.c',
+  'nm-device-ethernet.c',
+  'nm-device-generic.c',
+  'nm-device-infiniband.c',
+  'nm-device-ip-tunnel.c',
+  'nm-device-macsec.c',
+  'nm-device-macvlan.c',
+  'nm-device-modem.c',
+  'nm-device-olpc-mesh.c',
+  'nm-device-ovs-interface.c',
+  'nm-device-ovs-port.c',
+  'nm-device-ovs-bridge.c',
+  'nm-device-ppp.c',
+  'nm-device-team.c',
+  'nm-device-tun.c',
+  'nm-device-vlan.c',
+  'nm-device-vxlan.c',
+  'nm-device-wifi.c',
+  'nm-device-wimax.c',
+  'nm-dhcp-config.c',
+  'nm-dhcp4-config.c',
+  'nm-dhcp6-config.c',
+  'nm-dns-manager.c',
+  'nm-ip-config.c',
+  'nm-ip4-config.c',
+  'nm-ip6-config.c',
+  'nm-manager.c',
+  'nm-object.c',
+  'nm-remote-connection.c',
+  'nm-remote-settings.c',
+  'nm-secret-agent-old.c',
+  'nm-vpn-connection.c',
+  'nm-vpn-plugin-old.c',
+  'nm-vpn-editor.c',
+  'nm-vpn-service-plugin.c',
+  'nm-wimax-nsp.c'
+)
+
+deps = [
+  dl_dep,
+  libudev_dep,
+  shared_dep,
+  uuid_dep
+]
+
+linker_script = join_paths(meson.current_source_dir(), 'libnm.ver')
+
+
+libnm = shared_library(
+  'nm',
+  sources: libnm_sources + libnm_enum,
+  version: libnm_version,
+  include_directories: libnm_core_inc,
+  dependencies: deps,
+  c_args: cflags,
+  link_with: libnm_utils,
+  link_whole: libnm_core,
+  link_args: [
+    '-Wl,--version-script,@0@'.format(linker_script),
+  ],
+  link_depends: linker_script,
+  install: true
+)
+
+libnm_dep = declare_dependency(
+  sources: libnm_enum[1],
+  include_directories: libnm_inc,
+  link_with: libnm
+)
+
+pkg.generate(
+  libraries: libnm,
+  version: nm_version,
+  name: libnm_name,
+  description: 'Convenience library for clients of NetworkManager',
+  filebase: libnm_name,
+  subdirs: libnm_name,
+  requires: 'gio-2.0',
+  variables: [
+    'exec_prefix=${prefix}',
+    'vpnservicedir=' + join_paths(nm_pkglibdir, 'VPN')
+  ]
+)
+
+run_target(
+  'check-local-exports-' + libnm_name,
+  command: [check_exports, libnm.full_path(), linker_script],
+  depends: libnm
+)
+
+if enable_introspection
+  gir_sources = libnm_core_enum + libnm_core_headers + libnm_core_sources + libnm_enum + libnm_headers + libnm_sources + [version_header]
+
+  libnm_gir = gnome.generate_gir(
+    libnm,
+    sources: gir_sources,
+    nsversion: nm_gir_version,
+    namespace: 'NM',
+    identifier_prefix: nm_id_prefix,
+    symbol_prefix: nm_id_prefix.to_lower(),
+    export_packages: libnm_name,
+    includes: 'Gio-2.0',
+    extra_args: cflags,
+    header: 'NetworkManager.h',
+    install: true
+  )
+
+  generate_plugin_docs = join_paths(meson.current_source_dir(), 'generate-plugin-docs.pl')
+
+  name = 'nm-settings-keyfile-docs.xml'
+  nm_settings_keyfile_docs = custom_target(
+    name,
+    input: libnm_core_settings_sources,
+    output: name,
+    command: [perl, generate_plugin_docs, 'keyfile', '@OUTPUT@', '@INPUT@']
+  )
+
+  name = 'nm-settings-docs-overrides.xml'
+  nm_settings_docs_overrides = custom_target(
+    name,
+    input: libnm_core_settings_sources,
+    output: name,
+    command: [perl, generate_plugin_docs, 'dbus', '@OUTPUT@', '@INPUT@']
+  )
+
+  if enable_ifcfg_rh
+    name = 'nm-settings-ifcfg-rh-docs.xml'
+    nm_settings_ifcfg_rh_docs = custom_target(
+      name,
+      input: libnm_core_settings_sources,
+      output: name,
+      command: [perl, generate_plugin_docs, 'ifcfg-rh', '@OUTPUT@', '@INPUT@']
+    )
+  endif
+
+  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+
+  gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
+  if gi_typelib_path != ''
+    gi_typelib_path = ':' + gi_typelib_path
+  endif
+  gi_typelib_path = meson.current_build_dir() + gi_typelib_path
+
+  ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH').stdout()
+  if ld_library_path != ''
+    ld_library_path = ':' + ld_library_path
+  endif
+  ld_library_path = meson.current_build_dir() + ld_library_path
+
+  generate_setting_docs_env = [
+    'env', '-i',
+    'GI_TYPELIB_PATH=' + gi_typelib_path,
+    'LD_LIBRARY_PATH=' + ld_library_path
+  ]
+
+  name = 'nm-property-docs.xml'
+  nm_property_docs = custom_target(
+    name,
+    input: libnm_gir[0],
+    output: name,
+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
+    depends: libnm_gir
+  )
+
+  name = 'nm-settings-docs.xml'
+  nm_settings_docs = custom_target(
+    name,
+    input: libnm_gir[0],
+    output: name,
+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
+    depends: libnm_gir
+  )
+endif
+
+if enable_tests
+  subdir('tests')
+endif