[Pkg-javascript-commits] [dojo] 28/29: fixes #18784, update syntax of license in package.json

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.8.11
in repository dojo.

commit 277e4d2a27cb4229b7ae6216d6f8122d5a880ed1
Author: Dylan Schiemann <dylan at dojotoolkit.org>
Date:   Fri Feb 5 04:47:45 2016 -0700

    fixes #18784, update syntax of license in package.json
    
    (cherry picked from commit 47a613afb07bee9852814bbfb4c6963c7a71c730)
---
 package.json | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index d59d443..9ae02dd 100644
--- a/package.json
+++ b/package.json
@@ -6,20 +6,11 @@
 	},
 	"main": "main",
 	"description": "Dojo core is a powerful, lightweight library that makes common tasks quicker and easier. Animate elements, manipulate the DOM, and query with easy CSS syntax, all without sacrificing performance.",
-	"licenses": [
-		 {
-				 "type": "AFLv2.1",
-				 "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L43"
-		 },
-		 {
-				 "type": "BSD",
-				 "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L13"
-		 }
-	],
+	"license" : "BSD-3-Clause OR AFL-2.1",
 	"bugs": "http://bugs.dojotoolkit.org/",
 	"keywords": ["JavaScript", "Dojo", "Toolkit"],
 	"homepage": "http://dojotoolkit.org/",
-	"repository":{ 
+	"repository":{
 		"type": "git",
 		"url": "https://github.com/dojo/dojo.git"
 	},

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git