From 12c320d43a47e1b555f852df91fcca18bafb391a Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 10 Mar 2020 14:12:25 +0000
Subject: [PATCH] docs: Update license information in README and meson.build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some of the files in `malcontent-control` are GPL-2.0+.

Use the latest SPDX identifiers in the machine-readable data in
meson.build, but use the deprecated ‘+’ form in the README since it’s a
little more human friendly.

See https://spdx.org/licenses/.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 README.md   | 4 +++-
 meson.build | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 56f646e..512fb48 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,9 @@ Dependencies
 Licensing
 ---------
 
-All code in this project is licensed under LGPL-2.1+. See COPYING for more details.
+All code in the libraries in this project is licensed under LGPL-2.1+. Code in the
+`malcontent-control` application is licensed under GPL-2.0+. See `COPYING` and the
+copyright headers in individual files for more details.
 
 Bugs
 ----
diff --git a/meson.build b/meson.build
index 3575224..8fb7faa 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('malcontent', 'c',
   version : '0.6.0',
   meson_version : '>= 0.49.0',
-  license: 'LGPLv2.1+',
+  license: ['LGPL-2.1-or-later', 'GPL-2.0-or-later'],
   default_options : [
     'buildtype=debugoptimized',
     'warning_level=2',