jenkins-bot has submitted this change and it was merged.

Change subject: Tweaking license information
......................................................................


Tweaking license information

* Add license label to extension.json
* Make composer.json consistent with COPYING
  GPL-2.0+ is fine (see T130531)

Bug: T123943
Bug: T130531
Change-Id: I6e4d718a413a938a247ede847367769eefa6156a
---
M composer.json
M extension.json
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  Kghbln: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index ec220ba..0be3d82 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
                "ImageMap"
        ],
        "homepage": "https://www.mediawiki.org/wiki/Extension:ImageMap";,
-       "license" : "Any OSI approved license",
+       "license" : "GPL-2.0+",
        "require": {
                "php": ">=5.3.0",
                "composer/installers": "1.*,>=1.0.1"
diff --git a/extension.json b/extension.json
index c0adfb5..572c149 100644
--- a/extension.json
+++ b/extension.json
@@ -3,6 +3,7 @@
        "author": "Tim Starling",
        "url": "https://www.mediawiki.org/wiki/Extension:ImageMap";,
        "descriptionmsg": "imagemap_desc",
+       "license-name": "GPL-2.0+",
        "type": "parserhook",
        "MessagesDirs": {
                "ImageMap": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e4d718a413a938a247ede847367769eefa6156a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ImageMap
Gerrit-Branch: master
Gerrit-Owner: Kghbln <[email protected]>
Gerrit-Reviewer: Kghbln <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to