From 6e83f0eda4275603c2760375453dcc7ecb24e46c Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 10 Apr 2010 05:01:10 +0000 Subject: [PATCH] Added licenses & updated AboutSystem for BRegion backend. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36101 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- data/system/data/licenses/DEC | 20 ++++++++++++++++++++ data/system/data/licenses/OpenGroup | 23 +++++++++++++++++++++++ src/apps/aboutsystem/AboutSystem.cpp | 6 +++--- 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 data/system/data/licenses/DEC create mode 100644 data/system/data/licenses/OpenGroup diff --git a/data/system/data/licenses/DEC b/data/system/data/licenses/DEC new file mode 100644 index 0000000000..eafcd4952e --- /dev/null +++ b/data/system/data/licenses/DEC @@ -0,0 +1,20 @@ + +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. diff --git a/data/system/data/licenses/OpenGroup b/data/system/data/licenses/OpenGroup new file mode 100644 index 0000000000..5ea949688f --- /dev/null +++ b/data/system/data/licenses/OpenGroup @@ -0,0 +1,23 @@ + +Copyright 1987, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 +OPEN GROUP 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 The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 2f4acb6a67..45b88ef254 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -1196,9 +1196,9 @@ AboutView::_CreateCreditsView() COPYRIGHT_STRING "1987, 1988 Digital Equipment " "Corporation, Maynard, Massachusetts.\n" "All rights reserved.", - NULL)); - // TODO: License! - // NOTE: headers/build/private/interface/RegionSupport.h + NULL) + .SetLicenses("OpenGroup", "DEC", NULL)); + // TODO: URL // VL-Gothic font _AddPackageCredit(PackageCredit("VL-Gothic font")