From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Mar 2021 21:35:56 +0000 (+0000)
Subject: wikimedia: Tolerate AGPL3+, and LGPL tag, which means LGPLv2.1+
X-Git-Tag: otter-0.5.0~544
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=429c5138eefb31a2581d8ccfabca654b56070238;p=otter.git

wikimedia: Tolerate AGPL3+, and LGPL tag, which means LGPLv2.1+

LGPL2.1+ is upgradeable to AGPLv3+.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/library/wikimedia.toml b/library/wikimedia.toml
index 0e3c142f..d558ab35 100644
--- a/library/wikimedia.toml
+++ b/library/wikimedia.toml
@@ -5,9 +5,9 @@
 [scraper]
 method = "wikimedia"
 site-title = "Wikimedia"
-spdx = "CC-BY-SA-4.0"
+spdx = "CC-BY-SA-4.0 / AGPL-3.0-OR-LATER"
 
-licences = [ "Cc-by-sa-3.0", "Cc-by-sa-3.0-migrated", "cc-by-sa-4.0", "GFDL|migration=relicense", "cc-zero" ]
+licences = [ "Cc-by-sa-3.0", "Cc-by-sa-3.0-migrated", "cc-by-sa-4.0", "GFDL|migration=relicense", "cc-zero", "LGPL" ]
 filename_suffix = ".svg"
 url_prefix = "https://commons.wikimedia.org/wiki/File:"
 url_suffix = "?action=raw"
diff --git a/library/wikimedia/LICENCE b/library/wikimedia/LICENCE
index 54db1307..c8b9f189 100644
--- a/library/wikimedia/LICENCE
+++ b/library/wikimedia/LICENCE
@@ -1,11 +1,12 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
+SPDX-License-Identifier: CC-BY-SA-4.0 / AGPL-3.0-OR-LATER
 (applies to the contents of this directory unless otherwise stated)
 
 These files were all obtained from
     Wikimedia
 
 They are all available under at least, and distributed here under,
-    CC-BY-SA-4.0
+    CC-BY-SA-4.0 / AGPL-3.0-OR-LATER
+(deepending on the file - consult the source file for details)
 as well as possibly other licences.  There is NO WARRANTY.
 
 See <file>.download-log for the original URL and download timestamp.