[haiku-commits] r36100 - in haiku/trunk: data/system/data/licenses src/apps/aboutsystem
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 10 Apr 2010 06:51:29 +0200 (CEST)
Author: mmadia
Date: 2010-04-10 06:51:29 +0200 (Sat, 10 Apr 2010)
New Revision: 36100
Changeset: http://dev.haiku-os.org/changeset/36100/haiku
Added:
haiku/trunk/data/system/data/licenses/MIT (advertising clause)
Modified:
haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Added a new license: MIT with an advertising clause. This is mentioned on
http://en.wikipedia.org/wiki/MIT_License#Modified_versions_of_the_license
Updated AboutSystem to utilize them for libxml2, libxslt, & libexslt.
Added: haiku/trunk/data/system/data/licenses/MIT (advertising clause)
===================================================================
--- haiku/trunk/data/system/data/licenses/MIT (advertising clause)
(rev 0)
+++ haiku/trunk/data/system/data/licenses/MIT (advertising clause)
2010-04-10 04:51:29 UTC (rev 36100)
@@ -0,0 +1,24 @@
+Copyright (c) <year> <copyright holders>
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright holders
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization.
+
Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2010-04-08 21:29:25 UTC
(rev 36099)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2010-04-10 04:51:29 UTC
(rev 36100)
@@ -1330,17 +1330,15 @@
_AddPackageCredit(PackageCredit("libxml2, libxslt")
.SetCopyright(COPYRIGHT_STRING
"1998-2003 Daniel Veillard. All rights reserved.")
+ .SetLicense("MIT (advertising clause)")
.SetURL("http://xmlsoft.org";));
- // TODO: License!
- // NOTE: MIT license + cannot use author name for
promotion
_AddPackageCredit(PackageCredit("libexslt")
.SetCopyright(COPYRIGHT_STRING
"2001-2002 Thomas Broyer, Charlie "
"Bozeman and Daniel Veillard. All rights reserved.")
+ .SetLicense("MIT (advertising clause)")
.SetURL("http://xmlsoft.org";));
- // TODO: License!
- // NOTE: MIT license + cannot use author name for
promotion
// Xiph.org Foundation copyrights
_AddPackageCredit(PackageCredit("Xiph.org Foundation")
Other related posts:
