From 0ba335bc999195073023068b8a2dab0336af6826 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 27 Mar 2010 19:46:08 +0000 Subject: [PATCH] * Replaced MkDepend license file with a more generic BSD (Alternate 3-clause) * Updated several program's license & URL * Added a note about libxml2, libxslt, libexslt git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35980 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../{MkDepend => BSD (Alternate 3-clause)} | 6 +---- src/apps/aboutsystem/AboutSystem.cpp | 26 ++++++++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) rename data/system/data/licenses/{MkDepend => BSD (Alternate 3-clause)} (90%) diff --git a/data/system/data/licenses/MkDepend b/data/system/data/licenses/BSD (Alternate 3-clause) similarity index 90% rename from data/system/data/licenses/MkDepend rename to data/system/data/licenses/BSD (Alternate 3-clause) index 0fd9d2d9e4..6d1b0b3e2b 100644 --- a/data/system/data/licenses/MkDepend +++ b/data/system/data/licenses/BSD (Alternate 3-clause) @@ -1,6 +1,4 @@ -MkDepend License - -Copyright (c) 1995-2000, Lars Düning. +Copyright (c) All rights reserved. Redistribution and use in source and binary forms, with or without @@ -24,5 +22,3 @@ 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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$Id: LICENSE 1.2 Wed, 01 Mar 2000 21:15:40 -0700 lars $ diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 8ea0228634..437ef3f059 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -1303,13 +1303,15 @@ AboutView::_CreateCreditsView() // cortex copyrights _AddPackageCredit(PackageCredit("Cortex") - .SetCopyright(COPYRIGHT_STRING "1999-2000 Eric Moon.")); - // TODO: License! + .SetCopyright(COPYRIGHT_STRING "1999-2000 Eric Moon.") + .SetLicense("BSD (Alternate 3-clause)") + .SetURL("http://cortex.sourceforge.net/documentation")); // FluidSynth copyrights _AddPackageCredit(PackageCredit("FluidSynth") - .SetCopyright(COPYRIGHT_STRING "2003 Peter Hanappe and others.")); - // TODO: License! + .SetCopyright(COPYRIGHT_STRING "2003 Peter Hanappe and others.") + .SetLicense("GNU LGPL v2") + .SetURL("http://www.fluidsynth.org")); // CannaIM copyrights _AddPackageCredit(PackageCredit("CannaIM") @@ -1319,14 +1321,18 @@ AboutView::_CreateCreditsView() // libxml2, libxslt, libexslt copyrights _AddPackageCredit(PackageCredit("libxml2, libxslt") .SetCopyright(COPYRIGHT_STRING - "1998-2003 Daniel Veillard. All rights reserved.")); + "1998-2003 Daniel Veillard. All rights reserved.") + .SetURL("http://xmlsoft.org")); // TODO: License! + // NOTE: MIT license + cannot use author name for promotion _AddPackageCredit(PackageCredit("libexslt") .SetCopyright(COPYRIGHT_STRING "2001-2002 Thomas Broyer, Charlie " - "Bozeman and Daniel Veillard. All rights reserved.")); + "Bozeman and Daniel Veillard. All rights reserved.") + .SetURL("http://xmlsoft.org")); // TODO: License! + // NOTE: MIT license + cannot use author name for promotion // Xiph.org Foundation copyrights _AddPackageCredit(PackageCredit("Xiph.org Foundation") @@ -1334,21 +1340,21 @@ AboutView::_CreateCreditsView() COPYRIGHT_STRING "1994-2008 Xiph.Org. " "All rights reserved.", NULL) + .SetLicense("BSD (Alternate 3-clause)") .SetURL("http://www.xiph.org")); - // TODO: License! // The Tcpdump Group _AddPackageCredit(PackageCredit("The Tcpdump Group") .SetCopyright("tcpdump, libpcap") + .SetLicense("BSD (Alternate 3-clause)") .SetURL("http://www.tcpdump.org")); - // TODO: License! // Matroska _AddPackageCredit(PackageCredit("libmatroska") .SetCopyright(COPYRIGHT_STRING "2002-2003 Steve Lhomme. " "All rights reserved.") + .SetLicense("GNU LGPL v2.1") .SetURL("http://www.matroska.org")); - // TODO: License! // BColorQuantizer (originally CQuantizer code) _AddPackageCredit(PackageCredit("CQuantizer") @@ -1368,7 +1374,7 @@ AboutView::_CreateCreditsView() _AddPackageCredit(PackageCredit("MkDepend") .SetCopyright(COPYRIGHT_STRING "1995-2001 Lars Düning. " "All rights reserved.") - .SetLicense("MkDepend") + .SetLicense("BSD (Alternate 3-clause)") .SetURL("http://bearnip.com/lars/be")); // libhttpd copyright (used as Poorman backend)