[haiku-commits] r35998 - in haiku/trunk: data/system/data/licenses src/apps/aboutsystem
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 29 Mar 2010 20:10:43 +0200 (CEST)
Author: mmadia
Date: 2010-03-29 20:10:42 +0200 (Mon, 29 Mar 2010)
New Revision: 35998
Changeset: http://dev.haiku-os.org/changeset/35998/haiku
Added:
haiku/trunk/data/system/data/licenses/Bullet
haiku/trunk/data/system/data/licenses/Info-ZIP
Modified:
haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
* Added license files for Bullet, Info-ZIP
* Updated AboutSytem for Bullet, Info-ZIP, bzip2, & OpenEXR
* VIM was removed in r35848, updated AboutSystem to reflect this
Added: haiku/trunk/data/system/data/licenses/Bullet
===================================================================
--- haiku/trunk/data/system/data/licenses/Bullet
(rev 0)
+++ haiku/trunk/data/system/data/licenses/Bullet 2010-03-29 18:10:42 UTC
(rev 35998)
@@ -0,0 +1,17 @@
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans
+ http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim
+ that you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
Added: haiku/trunk/data/system/data/licenses/Info-ZIP
===================================================================
--- haiku/trunk/data/system/data/licenses/Info-ZIP
(rev 0)
+++ haiku/trunk/data/system/data/licenses/Info-ZIP 2010-03-29 18:10:42 UTC
(rev 35998)
@@ -0,0 +1,49 @@
+This is version 1999-Oct-05 of the Info-ZIP copyright and license.
+The definitive version of this document should be available at
+ftp://ftp.cdrom.com/pub/infozip/license.html indefinitely.
+
+
+Copyright (c) 1990-1999 Info-ZIP. All rights reserved.
+
+For the purposes of this copyright and license, "Info-ZIP" is defined as
+the following set of individuals:
+
+ Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
+ Jean-loup Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase,
+ Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, David Kirschbaum,
+ Johnny Lee, Onno van der Linden, Igor Mandrichenko, Steve P. Miller,
+ Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, Kai Uwe Rommel,
+ Steve Salisbury, Dave Smith, Christian Spieler, Antoine Verheijen,
+ Paul von Behren, Rich Wales, Mike White
+
+This software is provided "as is," without warranty of any kind, express
+or implied. In no event shall Info-ZIP or its contributors be held liable
+for any direct, indirect, incidental, special or consequential damages
+arising out of the use of or inability to use this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ definition, disclaimer, and this list of conditions.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, definition, disclaimer, and this list of conditions in
+ documentation and/or other materials provided with the distribution.
+
+ 3. Altered versions--including, but not limited to, ports to new operating
+ systems, existing ports with new graphical interfaces, and dynamic,
+ shared, or static library versions--must be plainly marked as such
+ and must not be misrepresented as being the original source. Such
+ altered versions also must not be misrepresented as being Info-ZIP
+ releases--including, but not limited to, labeling of the altered
+ versions with the names "Info-ZIP" (or any variation thereof, including,
+ but not limited to, different capitalizations), "Pocket UnZip," "WiZ"
+ or "MacZip" without the explicit permission of Info-ZIP. Such altered
+ versions are further prohibited from misrepresentative use of the
+ Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
+
+ 4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
+ "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its own source and
+ binary releases.
Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2010-03-29 17:41:31 UTC
(rev 35997)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2010-03-29 18:10:42 UTC
(rev 35998)
@@ -1232,20 +1232,17 @@
// zip copyrights
_AddPackageCredit(PackageCredit("Info-ZIP")
.SetCopyright(COPYRIGHT_STRING
- "1990-2002 Info-ZIP. All rights reserved."));
- // TODO: License!
+ "1990-2002 Info-ZIP. All rights reserved.")
+ .SetLicense("Info-ZIP")
+ .SetURL("http://www.info-zip.org";));
// bzip2 copyrights
_AddPackageCredit(PackageCredit("bzip2")
.SetCopyright(COPYRIGHT_STRING
- "1996-2005 Julian R Seward. All rights reserved."));
- // TODO: License!
+ "1996-2005 Julian R Seward. All rights reserved.")
+ .SetLicense("BSD (4-clause)")
+ .SetURL("http://bzip.org";));
- // VIM copyrights
- _AddPackageCredit(PackageCredit("Vi IMproved")
- .SetCopyright(COPYRIGHT_STRING "Bram Moolenaar et al."));
- // TODO: License!
-
// lp_solve copyrights
_AddPackageCredit(PackageCredit("lp_solve")
.SetCopyright(COPYRIGHT_STRING
@@ -1256,14 +1253,15 @@
// OpenEXR copyrights
_AddPackageCredit(PackageCredit("OpenEXR")
.SetCopyright(COPYRIGHT_STRING "2002-2005 Industrial Light &
Magic, "
- "a division of Lucas Digital Ltd. LLC."));
- // TODO: License!
+ "a division of Lucas Digital Ltd. LLC.")
+ .SetLicense("BSD (3-clause)")
+ .SetURL("http://www.openexr.com";));
// Bullet copyrights
_AddPackageCredit(PackageCredit("Bullet")
.SetCopyright(COPYRIGHT_STRING "2003-2008 Erwin Coumans")
+ .SetLicense("Bullet")
.SetURL("http://www.bulletphysics.com";));
- // TODO: License!
// atftp copyrights
_AddPackageCredit(PackageCredit("atftp")
Other related posts:
- » [haiku-commits] r35998 - in haiku/trunk: data/system/data/licenses src/apps/aboutsystem - mattmadia
