From 39fb1342dac13c24c2096b1925f25a8a971b9f08 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 13 Jun 2024 13:49:51 -0400 Subject: [PATCH] Manual.md: use SPDX expressions for license= xlint supports parsing this since leahneukirchen/xtools#322 SPDX expressions are more expressive and accurate than the comma-separated format, and WITH has already been usable for a long time. --- Manual.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Manual.md b/Manual.md index 507a18729459bb..80cc8f2c0bdd8b 100644 --- a/Manual.md +++ b/Manual.md @@ -439,7 +439,12 @@ The list of mandatory variables for a template: - `license` A string matching the license's [SPDX Short identifier](https://spdx.org/licenses), `Public Domain`, or string prefixed with `custom:` for other licenses. -Multiple licenses should be separated by commas, Example: `GPL-3.0-or-later, custom:Hugware`. +Multiple licenses should be listed as an +[SPDX license expression](https://spdx.github.io/spdx-spec/v3.0/annexes/SPDX-license-expressions/) +(examples: `MIT OR Apache-2.0`, `MIT AND (LGPL-2.1-or-later OR BSD-3-Clause)`). +Usage of `AND`, `OR`, `WITH`, and `()` are supported by xlint. +The legacy comma-separated format should be converted when encountered (example: +`GPL-3.0-or-later, custom:Hugware`). Empty meta-packages that don't include any files and thus have and require no license should use