From bbf48291afdbf331f957b174348f5255e21721dd Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Mon, 29 Mar 2010 17:41:31 +0000 Subject: [PATCH] Added licenses for expat, zlib. Updated AboutSystem for Mesa, expat, & zlib. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35997 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- data/system/data/licenses/Expat | 22 +++++++++++++++++++++ data/system/data/licenses/Zlib | 29 ++++++++++++++++++++++++++++ src/apps/aboutsystem/AboutSystem.cpp | 13 +++++++------ 3 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 data/system/data/licenses/Expat create mode 100644 data/system/data/licenses/Zlib diff --git a/data/system/data/licenses/Expat b/data/system/data/licenses/Expat new file mode 100644 index 0000000000..5c5d524a1f --- /dev/null +++ b/data/system/data/licenses/Expat @@ -0,0 +1,22 @@ +Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper +Copyright (c) 2001, 2002, 2003 Expat maintainers. + +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. diff --git a/data/system/data/licenses/Zlib b/data/system/data/licenses/Zlib new file mode 100644 index 0000000000..125f989873 --- /dev/null +++ b/data/system/data/licenses/Zlib @@ -0,0 +1,29 @@ +/* zlib.h -- interface of the 'zlib' general purpose compression library + version 1.2.3, July 18th, 2005 + + Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler + + 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. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + + The data format used by the zlib library is described by RFCs (Request for + Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt + (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). +*/ \ No newline at end of file diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 3fbb8630b0..890ca0020c 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -1170,9 +1170,8 @@ AboutView::_CreateCreditsView() _AddPackageCredit(PackageCredit("Mesa") .SetCopyright(COPYRIGHT_STRING "1999-2006 Brian Paul. " "Mesa3D Project. All rights reserved.") + .SetLicense("MIT") .SetURL("http://www.mesa3d.org")); - // TODO: License! - // NOTE: http://www.mesa3d.org/license.html // SGI's GLU implementation copyrights _AddPackageCredit(PackageCredit("GLU") @@ -1219,14 +1218,16 @@ AboutView::_CreateCreditsView() "1998, 1999, 2000 Thai Open Source " "Software Center Ltd and Clark Cooper.", COPYRIGHT_STRING "2001, 2002, 2003 Expat maintainers.", - NULL)); - // TODO: License! + NULL) + .SetLicense("Expat") + .SetURL("http://expat.sourceforge.net")); // zlib copyrights _AddPackageCredit(PackageCredit("zlib") .SetCopyright(COPYRIGHT_STRING - "1995-2004 Jean-loup Gailly and Mark Adler.")); - // TODO: License! + "1995-2004 Jean-loup Gailly and Mark Adler.") + .SetLicense("Zlib") + .SetURL("http://www.zlib.net")); // zip copyrights _AddPackageCredit(PackageCredit("Info-ZIP")