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

diff --git a/shared/meson.build b/shared/meson.build
new file mode 100644
index 00000000..db6b8a40
--- /dev/null
+++ b/shared/meson.build
@@ -0,0 +1,78 @@
+shared_inc = include_directories('.')
+
+shared_c_siphash = static_library(
+    'c-siphash',
+    sources: 'c-siphash/src/c-siphash.c',
+)
+
+shared_c_siphash_dep = declare_dependency(
+    include_directories: shared_inc,
+    link_with: shared_c_siphash,
+)
+
+shared_n_acd = static_library(
+    'n-acd',
+    sources: 'n-acd/src/n-acd.c',
+    include_directories: [
+        include_directories('c-siphash/src'),
+        include_directories('c-list/src'),
+    ],
+    dependencies: shared_c_siphash_dep,
+)
+
+shared_n_acd_dep = declare_dependency(
+    include_directories: shared_inc,
+    link_with: shared_n_acd,
+)
+
+version_conf = configuration_data()
+version_conf.set('NM_MAJOR_VERSION', nm_major_version)
+version_conf.set('NM_MINOR_VERSION', nm_minor_version)
+version_conf.set('NM_MICRO_VERSION', nm_micro_version)
+
+version_header = configure_file(
+    input: 'nm-version-macros.h.in',
+    output: 'nm-version-macros.h',
+    configuration: version_conf,
+)
+
+shared_nm_utils_nm_meta_setting_c = files('nm-meta-setting.c')
+
+shared_nm_test_utils_impl_c = files('nm-test-utils-impl.c')
+
+shared_nm_utils_nm_vpn_plugin_utils_c = files('nm-utils/nm-vpn-plugin-utils.c')
+
+shared_files_libnm_core = files('''
+    c-siphash/src/c-siphash.c
+    nm-utils/c-list-util.c
+    nm-utils/nm-dedup-multi.c
+    nm-utils/nm-enum-utils.c
+    nm-utils/nm-hash-utils.c
+    nm-utils/nm-random-utils.c
+    nm-utils/nm-shared-utils.c
+    nm-utils/nm-udev-utils.c
+'''.split())
+
+shared_files_clients_common = files('''
+    c-siphash/src/c-siphash.c
+    nm-utils/nm-enum-utils.c
+    nm-utils/nm-hash-utils.c
+    nm-utils/nm-random-utils.c
+    nm-utils/nm-shared-utils.c
+'''.split())
+
+shared_files_libnm_util = files('''
+    nm-utils/nm-shared-utils.c
+'''.split())
+
+shared_files_libnm_glib = files('''
+    nm-utils/nm-udev-utils.c
+'''.split())
+
+shared_dep = declare_dependency(
+    include_directories: [
+        top_inc,
+        shared_inc,
+    ],
+    dependencies: glib_dep,
+)