[haiku-commits] r36141 - in haiku/trunk: data/system/data/licenses src/apps/aboutsystem

From: mattmadia@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sun, 11 Apr 2010 12:56:08 +0200 (CEST)
Author: mmadia
Date: 2010-04-11 12:56:08 +0200 (Sun, 11 Apr 2010)
New Revision: 36141
Changeset: http://dev.haiku-os.org/changeset/36141/haiku

Added:
   haiku/trunk/data/system/data/licenses/MIT (no promotion)
Removed:
   haiku/trunk/data/system/data/licenses/MIT (advertising clause)
Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Renamed the variant MIT license & updated AboutSystem accordingly.


Added: haiku/trunk/data/system/data/licenses/MIT (no promotion)
===================================================================
--- haiku/trunk/data/system/data/licenses/MIT (no promotion)                    
        (rev 0)
+++ haiku/trunk/data/system/data/licenses/MIT (no promotion)    2010-04-11 
10:56:08 UTC (rev 36141)
@@ -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-11 09:59:59 UTC 
(rev 36140)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp    2010-04-11 10:56:08 UTC 
(rev 36141)
@@ -1330,14 +1330,14 @@
        _AddPackageCredit(PackageCredit("libxml2, libxslt")
                .SetCopyright(COPYRIGHT_STRING
                        "1998-2003 Daniel Veillard. All rights reserved.")
-               .SetLicense("MIT (advertising clause)")
+               .SetLicense("MIT (no promotion)")
                .SetURL("http://xmlsoft.org";));
 
        _AddPackageCredit(PackageCredit("libexslt")
                .SetCopyright(COPYRIGHT_STRING
                        "2001-2002 Thomas Broyer, Charlie "
                        "Bozeman and Daniel Veillard.  All rights reserved.")
-               .SetLicense("MIT (advertising clause)")
+               .SetLicense("MIT (no promotion)")
                .SetURL("http://xmlsoft.org";));
 
        // Xiph.org Foundation copyrights
[haiku-commits] r36141 - in haiku/trunk: data/system/data/licenses src/apps/aboutsystem

Other related posts:
