From c5174c0a7e3464ea68ac533b9551a2c8df7fb091 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 4 May 2008 16:08:30 +0000 Subject: [PATCH] Add libMicro copyright and license to the image when the respective optional package is installed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25314 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalTestPackages | 6 ++++++ src/apps/aboutsystem/AboutSystem.cpp | 6 ------ .../system/benchmarks/libMicro/.OptionalPackageDescription | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 src/tests/system/benchmarks/libMicro/.OptionalPackageDescription diff --git a/build/jam/OptionalTestPackages b/build/jam/OptionalTestPackages index 29071a1fd3..984b7a7591 100644 --- a/build/jam/OptionalTestPackages +++ b/build/jam/OptionalTestPackages @@ -32,6 +32,12 @@ if [ IsOptionalHaikuImagePackageAdded libMicro ] { write writev ; AddSymlinkToHaikuImage home benchmarks libmicro : bin-BePC : bin ; + + AddOptionalPackageDescriptionToHaikuImage + .OptionalPackageDescription + : $(HAIKU_TOP) src tests system benchmarks libMicro ; + AddLicenseToHaikuImage OPENSOLARIS.LICENSE : OpenSolaris + : $(HAIKU_TOP) src tests system benchmarks libMicro ; } diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 97574bed42..3d901d1c3d 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -660,12 +660,6 @@ AboutView::AboutView(const BRect &rect) // "Copyright " B_UTF8_COPYRIGHT " 2008 Igor Pavlov. " // "All rights reserved."); -// libMicros copyrights -// AddCopyrightEntry("libMicro", -// "Copyright " B_UTF8_COPYRIGHT " 2007 Sun Microsystems, Inc. " -// "All rights reserved."); - // Open Solaris License - // libpng copyrights AddCopyrightEntry("libpng", "Copyright " B_UTF8_COPYRIGHT " 2004, 2006-2008 Glenn " diff --git a/src/tests/system/benchmarks/libMicro/.OptionalPackageDescription b/src/tests/system/benchmarks/libMicro/.OptionalPackageDescription new file mode 100644 index 0000000000..f8d6f5dbde --- /dev/null +++ b/src/tests/system/benchmarks/libMicro/.OptionalPackageDescription @@ -0,0 +1,3 @@ +Package: libMicro +Copyright: 2007 Sun Microsystems, Inc. All rights reserved. +License: OpenSolaris