[haiku-commits] r35996 - in haiku/trunk: data/system/data/licenses src/apps/aboutsystem
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 29 Mar 2010 19:22:08 +0200 (CEST)
Author: mmadia
Date: 2010-03-29 19:22:08 +0200 (Mon, 29 Mar 2010)
New Revision: 35996
Changeset: http://dev.haiku-os.org/changeset/35996/haiku
Added:
haiku/trunk/data/system/data/licenses/GLUT (Mark Kilgard)
haiku/trunk/data/system/data/licenses/SGI Free B
Modified:
haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
* Added license files for GLU & GLUT
* Updated AboutSystem to reference new licenses
* information based on http://www.mesa3d.org/license.html
Added: haiku/trunk/data/system/data/licenses/GLUT (Mark Kilgard)
===================================================================
--- haiku/trunk/data/system/data/licenses/GLUT (Mark Kilgard)
(rev 0)
+++ haiku/trunk/data/system/data/licenses/GLUT (Mark Kilgard) 2010-03-29
17:22:08 UTC (rev 35996)
@@ -0,0 +1,5 @@
+/* Copyright (c) Mark J. Kilgard, 1994, 1997, 1998. */
+
+/* This program is freely distributable without licensing fees
+ and is provided without guarantee or warrantee expressed or
+ implied. This program is -not- in the public domain. */
Added: haiku/trunk/data/system/data/licenses/SGI Free B
===================================================================
--- haiku/trunk/data/system/data/licenses/SGI Free B
(rev 0)
+++ haiku/trunk/data/system/data/licenses/SGI Free B 2010-03-29 17:22:08 UTC
(rev 35996)
@@ -0,0 +1,29 @@
+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
+ *
+ * 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2010-03-29 16:47:57 UTC
(rev 35995)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2010-03-29 17:22:08 UTC
(rev 35996)
@@ -1178,8 +1178,9 @@
_AddPackageCredit(PackageCredit("GLU")
.SetCopyright(COPYRIGHT_STRING
"1991-2000 Silicon Graphics, Inc. "
- "SGI's Software FreeB license. All rights reserved."));
- // TODO: License!
+ "SGI's Software FreeB license. All rights reserved.")
+ .SetLicense("SGI Free B")
+ .SetURL("http://www.sgi.com/products/software/opengl";));
// GLUT implementation copyrights
_AddPackageCredit(PackageCredit("GLUT")
@@ -1187,8 +1188,9 @@
"All rights reserved.",
COPYRIGHT_STRING "1997 Be Inc.",
COPYRIGHT_STRING "1999 Jake Hamby.",
- NULL));
- // TODO: License!
+ NULL)
+ .SetLicense("GLUT (Mark Kilgard)")
+ .SetURL("http://www.opengl.org/resources/libraries/glut";));
// OpenGroup & DEC (BRegion backend) copyright
_AddPackageCredit(PackageCredit("BRegion backend (XFree86)")
Other related posts:
- » [haiku-commits] r35996 - in haiku/trunk: data/system/data/licenses src/apps/aboutsystem - mattmadia
