Mailing List Archive

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405919 )

Change subject: Use SPDX 3.0 license identifiers
......................................................................


Use SPDX 3.0 license identifiers

Change-Id: If755ec10a96e0b76a615de894d61f2345dc470cd
---
M cookiecutter.json
M {{ cookiecutter.library_name }}/COPYING
M {{ cookiecutter.library_name }}/src/{{ cookiecutter.library_name }}.php
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified



diff --git a/cookiecutter.json b/cookiecutter.json
index 2aaec28..7f4de62 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -3,5 +3,5 @@
"description": "A short description about your library",
"author_name": "Your Name",
"author_email": "youremail@domain.ext",
- "license": "GPL-2.0+"
+ "license": "GPL-2.0-or-later"
}
diff --git "a/\173\173 cookiecutter.library_name \175\175/COPYING" "b/\173\173 cookiecutter.library_name \175\175/COPYING"
index f7bcde1..49a4e1f 100644
--- "a/\173\173 cookiecutter.library_name \175\175/COPYING"
+++ "b/\173\173 cookiecutter.library_name \175\175/COPYING"
@@ -1,4 +1,4 @@
-{% if cookiecutter.license == 'GPL-2.0' or cookiecutter.license == 'GPL-2.0+' %}
+{% if cookiecutter.license == 'GPL-2.0-only' or cookiecutter.license == 'GPL-2.0-or-later' %}
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991

diff --git "a/\173\173 cookiecutter.library_name \175\175/src/\173\173 cookiecutter.library_name \175\175.php" "b/\173\173 cookiecutter.library_name \175\175/src/\173\173 cookiecutter.library_name \175\175.php"
index 450b934..6fee715 100644
--- "a/\173\173 cookiecutter.library_name \175\175/src/\173\173 cookiecutter.library_name \175\175.php"
+++ "b/\173\173 cookiecutter.library_name \175\175/src/\173\173 cookiecutter.library_name \175\175.php"
@@ -1,4 +1,4 @@
-<?php{% if cookiecutter.license == 'GPL-2.0' or cookiecutter.license == 'GPL-2.0+' %}
+<?php{% if cookiecutter.license == 'GPL-2.0-only' or cookiecutter.license == 'GPL-2.0-or-later' %}
/**
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

--
To view, visit https://gerrit.wikimedia.org/r/405919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If755ec10a96e0b76a615de894d61f2345dc470cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/cookiecutter-library
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm@member.fsf.org>
Gerrit-Reviewer: Legoktm <legoktm@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits