[SCM] mediaconch/master: Document MIT-licensed bits

hyperair at users.alioth.debian.org hyperair at users.alioth.debian.org
Mon Feb 8 05:35:22 UTC 2016


The following commit has been merged in the master branch:
commit c3ed66da6cc3f886a5964d1e3ab73678aa7363c7
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Feb 8 11:09:21 2016 +0800

    Document MIT-licensed bits

diff --git a/debian/copyright b/debian/copyright
index 8f8391e..37f1266 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,6 +16,28 @@ License: public-domain
     May you find forgiveness for yourself and forgive others.
     May you share freely, never taking more than you give.
 
+Files: Source/Resource/html/css/bootstrap.min.css
+       Source/Resource/html/js/bootstrap.js
+       Source/Resource/html/js/bootstrap.min.js
+Copyright: 2011-2015, Twitter, Inc.
+License: MIT
+
+Files: Source/Resource/html/js/jstree.min.js
+       Source/Resource/html/js/jstree.js
+       Source/Resource/html/css/32px.png
+       Source/Resource/html/css/40px.png
+       Source/Resource/html/css/jstree.min.css
+Copyright: 2014 Ivan Bozhanov
+License: MIT
+
+Files: Source/Resource/html/js/jquery-1.11.2.js
+Copyright: 2005-2011 John Resig, Brandon Aaron & Jörn Zaefferer
+License: GPL-2 or MIT
+
+Files: Source/Resource/html/js/jstreegrid.js
+Copyright: 2010, Avi Deitcher <avi at deitcher.net>
+License: MIT
+
 Files: debian/*
 Copyright: 2015, Chow Loong Jin <hyperair at debian.org>
 License: GPL-3+ or MPL-2+
@@ -343,3 +365,21 @@ License: MPL-2+
  ***** Exhibit B - "Incompatible With Secondary Licenses" Notice *****
       This Source Code Form is "Incompatible With Secondary Licenses",
       as defined by the Mozilla Public License, v. 2.0.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the “Software”), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ the Software, and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-- 
mediaconch packaging



More information about the pkg-multimedia-commits mailing list