From 210cbb4bd19ec6005f7270da9df382b95219a6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 21 Jun 2007 10:14:11 +0000 Subject: [PATCH] * Removed the old LICENSE files of the previous S3 Savage driver as suggested by Gerald. * Added Gerald Zajac and Jan Kloetzke to the list of contributors. * Added the s3savage driver and accelerant to the image. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21478 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 6 ++--- src/add-ons/accelerants/s3savage/LICENSE | 27 ------------------- .../kernel/drivers/graphics/s3savage/LICENSE | 27 ------------------- src/apps/aboutsystem/AboutSystem.cpp | 2 ++ 4 files changed, 5 insertions(+), 57 deletions(-) delete mode 100644 src/add-ons/accelerants/s3savage/LICENSE delete mode 100644 src/add-ons/kernel/drivers/graphics/s3savage/LICENSE diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 53fecc7500..8aa1367a22 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -75,7 +75,7 @@ BEOS_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ; BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nvidia.accelerant $(X86_ONLY)matrox.accelerant $(X86_ONLY)neomagic.accelerant - $(X86_ONLY)intel_extreme.accelerant vesa.accelerant + $(X86_ONLY)intel_extreme.accelerant $(X86_ONLY)s3savage.accelerant vesa.accelerant #$(X86_ONLY)vmware.accelerant ; BEOS_ADD_ONS_TRANSLATORS = BMPTranslator GIFTranslator JPEGTranslator @@ -108,8 +108,8 @@ BEOS_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port BEOS_ADD_ONS_SCREENSAVERS = Haiku IFS ; BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia emuxki hda ; BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia - $(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme vesa - #$(X86_ONLY)vmware + $(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme + $(X86_ONLY)s3savage vesa #$(X86_ONLY)vmware ; BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ; BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900 diff --git a/src/add-ons/accelerants/s3savage/LICENSE b/src/add-ons/accelerants/s3savage/LICENSE deleted file mode 100644 index 5311dbed10..0000000000 --- a/src/add-ons/accelerants/s3savage/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -This is a modified version of the XFree86 license. - -The binary and source form of this software is covered by the -following copyright/license. - -Copyright (C) 1999 Erdi Chen. 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 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 AUTHOR 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/src/add-ons/kernel/drivers/graphics/s3savage/LICENSE b/src/add-ons/kernel/drivers/graphics/s3savage/LICENSE deleted file mode 100644 index 5311dbed10..0000000000 --- a/src/add-ons/kernel/drivers/graphics/s3savage/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -This is a modified version of the XFree86 license. - -The binary and source form of this software is covered by the -following copyright/license. - -Copyright (C) 1999 Erdi Chen. 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 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 AUTHOR 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/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index fc0d7451b7..1425c7d44c 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -391,6 +391,7 @@ AboutView::AboutView(const BRect &rect) "Carwyn Jones\n" "Vasilis Kaoutsis\n" "Euan Kirkhope\n" + "Jan Klötzke\n" "Marcin Konicki\n" "Kurtis Kopf\n" "Thomas Kurschel\n" @@ -431,6 +432,7 @@ AboutView::AboutView(const BRect &rect) "Michael Wilber\n" "Ulrich Wimboeck\n" "Gabe Yoder\n" + "Gerald Zajac\n" "Łukasz Zemczak\n" "\n" B_UTF8_ELLIPSIS " and probably some more we forgot to mention (sorry!)" "\n\n");