From ee9c73a923909e23a649407be77e25235d769e25 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 11 May 2018 22:08:45 +0200
Subject: New upstream version 1.10.8

---
 clients/cli/meson.build | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 clients/cli/meson.build

(limited to 'clients/cli/meson.build')

diff --git a/clients/cli/meson.build b/clients/cli/meson.build
deleted file mode 100644
index 65317a0a..00000000
--- a/clients/cli/meson.build
+++ /dev/null
@@ -1,48 +0,0 @@
-name = 'nmcli'
-
-# FIXME: nmcli-completion should be renamed to nmcli
-install_data(
-  'nmcli-completion',
-  install_dir: join_paths(nm_datadir, 'bash-completion', 'completions')
-)
-
-sources = files(
-  'agent.c',
-  'common.c',
-  'connections.c',
-  'devices.c',
-  'general.c',
-  'nmcli.c',
-  'polkit-agent.c',
-  'settings.c',
-  'utils.c'
-)
-
-deps = [
-  libnm_dep,
-  libnmc_base_dep,
-  libnmc_dep,
-  nm_core_dep,
-  readline_dep
-]
-
-cflags = clients_cflags + [
-  '-DG_LOG_DOMAIN="@0@"'.format(name),
-  '-DNMCLI_LOCALEDIR="@0@"'.format(nm_localedir)
-]
-
-if enable_polkit_agent
-  sources += nm_polkit_listener
-
-  deps += polkit_agent_dep
-endif
-
-executable(
-  name,
-  sources,
-  dependencies: deps,
-  c_args: cflags,
-  link_args: ldflags_linker_script_binary,
-  link_depends: linker_script_binary,
-  install: true
-)
-- 
cgit 1.3.0-6-gf8a5


From 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Mon, 4 Jun 2018 00:07:45 +0200
Subject: New upstream version 1.11.4

---
 clients/cli/meson.build | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 clients/cli/meson.build

(limited to 'clients/cli/meson.build')

diff --git a/clients/cli/meson.build b/clients/cli/meson.build
new file mode 100644
index 00000000..9449ce63
--- /dev/null
+++ b/clients/cli/meson.build
@@ -0,0 +1,49 @@
+name = 'nmcli'
+
+# FIXME: nmcli-completion should be renamed to nmcli
+install_data(
+  'nmcli-completion',
+  install_dir: join_paths(nm_datadir, 'bash-completion', 'completions')
+)
+
+sources = files(
+  'agent.c',
+  'common.c',
+  'connections.c',
+  'devices.c',
+  'general.c',
+  'nmcli.c',
+  'polkit-agent.c',
+  'settings.c',
+  'utils.c'
+)
+
+deps = [
+  libnm_dep,
+  libnmc_base_dep,
+  libnmc_dep,
+  nm_core_dep,
+  readline_dep
+]
+
+cflags = clients_cflags + [
+  '-DSYSCONFDIR="@0@"'.format(nm_sysconfdir),
+  '-DG_LOG_DOMAIN="@0@"'.format(name),
+  '-DNMLOCALEDIR="@0@"'.format(nm_localedir)
+]
+
+if enable_polkit_agent
+  sources += nm_polkit_listener
+
+  deps += polkit_agent_dep
+endif
+
+executable(
+  name,
+  sources,
+  dependencies: deps,
+  c_args: cflags,
+  link_args: ldflags_linker_script_binary,
+  link_depends: linker_script_binary,
+  install: true
+)
-- 
cgit 1.3.0-6-gf8a5