From e82fd078771003bc7823f17a7b9da7dcdf8da105 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 26 Sep 2020 18:39:53 +0100 Subject: [PATCH] wikimedia: Upgrade to CC-BY-SA-4.0 According to https://creativecommons.org/share-your-work/licensing-considerations/compatible-licenses/ CC-BY-SA-3.0 is compatible with CC-BY-SA 4.0. So is GFDFL 1.3, so relicenced things are fine too. So we can upgrade our wikimedia downloads to CC-BY-SA 4.0. Signed-off-by: Ian Jackson --- library/wikimedia.toml | 2 +- library/wikimedia/LICENCE | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/wikimedia.toml b/library/wikimedia.toml index 69e7b2ed..cac83171 100644 --- a/library/wikimedia.toml +++ b/library/wikimedia.toml @@ -7,7 +7,7 @@ method = "wikimedia" site-title = "Wikimedia" spdx = "CC-BY-SA-3.0" -licences = [ "Cc-by-sa-3.0", "GFDL|migration=relicense" ] +licences = [ "Cc-by-sa-3.0", "cc-by-sa-4.0", "GFDL|migration=relicense" ] 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 b76a9ded..fa8aacdf 100644 --- a/library/wikimedia/LICENCE +++ b/library/wikimedia/LICENCE @@ -1,11 +1,11 @@ -SPDX-License-Identifier: CC-BY-SA-3.0 +SPDX-License-Identifier: CC-BY-SA-4.0 (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-3.0 + CC-BY-SA-4.0 as well as possibly other licences. There is NO WARRANTY. See .download-log for the original URL and download timestamp. -- 2.30.2