docs: Update license information in README and meson.build

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>
This commit is contained in:
Philip Withnall 2020-03-10 14:12:25 +00:00
parent 1064221a9c
commit 12c320d43a
2 changed files with 4 additions and 2 deletions

View File

@ -101,7 +101,9 @@ Dependencies
Licensing 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 Bugs
---- ----

View File

@ -1,7 +1,7 @@
project('malcontent', 'c', project('malcontent', 'c',
version : '0.6.0', version : '0.6.0',
meson_version : '>= 0.49.0', meson_version : '>= 0.49.0',
license: 'LGPLv2.1+', license: ['LGPL-2.1-or-later', 'GPL-2.0-or-later'],
default_options : [ default_options : [
'buildtype=debugoptimized', 'buildtype=debugoptimized',
'warning_level=2', 'warning_level=2',