[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: Use SPDX 3.0 license identifier

2018-01-04 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401860 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ib701457f964bf2ae76dc6a5478c1823ce9d57d9e
---
M extension.json
M maintenance/blockAndNukeSpammers.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index b706ce0..5561d70 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:BlockAndNuke;,
"descriptionmsg": "blockandnuke-desc",
-   "license-name": "GPL-3.0+",
+   "license-name": "GPL-3.0-or-later",
"type": "specialpage",
"GroupPermissions": {
"sysop": {
diff --git a/maintenance/blockAndNukeSpammers.php 
b/maintenance/blockAndNukeSpammers.php
index dbcd5d2..2b79f1f 100644
--- a/maintenance/blockAndNukeSpammers.php
+++ b/maintenance/blockAndNukeSpammers.php
@@ -7,7 +7,7 @@
  * PLEASE USE WITH CAUTION. ALL USERS *NOT* IN THE WHITELIST WILL BE BLOCKED 
AND ITS
  * CONTRIBUTIONS DELETED!
  *
- * @license GPL-3.0+ 
+ * @license GPL-3.0-or-later 
  */
 
 require_once dirname( dirname( dirname( __DIR__ ) ) ) . 
'/maintenance/Maintenance.php';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib701457f964bf2ae76dc6a5478c1823ce9d57d9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401860 )

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ib701457f964bf2ae76dc6a5478c1823ce9d57d9e
---
M extension.json
M maintenance/blockAndNukeSpammers.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlockAndNuke 
refs/changes/60/401860/1

diff --git a/extension.json b/extension.json
index b706ce0..5561d70 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:BlockAndNuke;,
"descriptionmsg": "blockandnuke-desc",
-   "license-name": "GPL-3.0+",
+   "license-name": "GPL-3.0-or-later",
"type": "specialpage",
"GroupPermissions": {
"sysop": {
diff --git a/maintenance/blockAndNukeSpammers.php 
b/maintenance/blockAndNukeSpammers.php
index dbcd5d2..2b79f1f 100644
--- a/maintenance/blockAndNukeSpammers.php
+++ b/maintenance/blockAndNukeSpammers.php
@@ -7,7 +7,7 @@
  * PLEASE USE WITH CAUTION. ALL USERS *NOT* IN THE WHITELIST WILL BE BLOCKED 
AND ITS
  * CONTRIBUTIONS DELETED!
  *
- * @license GPL-3.0+ 
+ * @license GPL-3.0-or-later 
  */
 
 require_once dirname( dirname( dirname( __DIR__ ) ) ) . 
'/maintenance/Maintenance.php';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib701457f964bf2ae76dc6a5478c1823ce9d57d9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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