From 6df085f964f9c16c64b9f70629e92659b5fecf0b Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Tue, 12 Dec 2023 13:17:05 +0100 Subject: Fix errors in license `prompt_adam3_setup` specified another license than what `LICENSE` did. Also renamed `LICENCE` to `LICENSE` --- LICENCE | 33 --------------------------------- LICENSE | 33 +++++++++++++++++++++++++++++++++ prompt_adam3_setup | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 LICENCE create mode 100644 LICENSE diff --git a/LICENCE b/LICENCE deleted file mode 100644 index 78ce01d..0000000 --- a/LICENCE +++ /dev/null @@ -1,33 +0,0 @@ -The adam3 prompt is based upon adam1, which is a prompt that is distributed -with zsh. - -The original code uses the licence below. Any and all changes follows the same -licence. - --- - -The Z Shell is copyright (c) 1992-2009 Paul Falstad, Richard Coleman, -Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wischnowsky, and -others. All rights reserved. Individual authors, whether or not -specifically named, retain copyright in all changes; in what follows, they -are referred to as `the Zsh Development Group'. This is for convenience -only and this body has no legal status. The Z shell is distributed under -the following licence; any provisions made in individual files take -precedence. - -Permission is hereby granted, without written agreement and without -licence or royalty fees, to use, copy, modify, and distribute this -software and to distribute modified versions of this software for any -purpose, provided that the above copyright notice and the following -two paragraphs appear in all copies of this software. - -In no event shall the Zsh Development Group be liable to any party for -direct, indirect, special, incidental, or consequential damages arising out -of the use of this software and its documentation, even if the Zsh -Development Group have been advised of the possibility of such damage. - -The Zsh Development Group specifically disclaim any warranties, including, -but not limited to, the implied warranties of merchantability and fitness -for a particular purpose. The software provided hereunder is on an "as is" -basis, and the Zsh Development Group have no obligation to provide -maintenance, support, updates, enhancements, or modifications. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..755551e --- /dev/null +++ b/LICENSE @@ -0,0 +1,33 @@ +The adam3 prompt is based upon adam1, which is a prompt that is distributed +with zsh. + +The original code uses the license below. Any and all changes follows the same +license. + +-- + +The Z Shell is copyright (c) 1992-2009 Paul Falstad, Richard Coleman, +Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wischnowsky, and +others. All rights reserved. Individual authors, whether or not +specifically named, retain copyright in all changes; in what follows, they +are referred to as `the Zsh Development Group'. This is for convenience +only and this body has no legal status. The Z shell is distributed under +the following licence; any provisions made in individual files take +precedence. + +Permission is hereby granted, without written agreement and without +licence or royalty fees, to use, copy, modify, and distribute this +software and to distribute modified versions of this software for any +purpose, provided that the above copyright notice and the following +two paragraphs appear in all copies of this software. + +In no event shall the Zsh Development Group be liable to any party for +direct, indirect, special, incidental, or consequential damages arising out +of the use of this software and its documentation, even if the Zsh +Development Group have been advised of the possibility of such damage. + +The Zsh Development Group specifically disclaim any warranties, including, +but not limited to, the implied warranties of merchantability and fitness +for a particular purpose. The software provided hereunder is on an "as is" +basis, and the Zsh Development Group have no obligation to provide +maintenance, support, updates, enhancements, or modifications. diff --git a/prompt_adam3_setup b/prompt_adam3_setup index 8cb8afa..15a67cf 100644 --- a/prompt_adam3_setup +++ b/prompt_adam3_setup @@ -3,7 +3,7 @@ # the hostname of your current host # Authors: Dennis Eriksen # Bug-Reports: Email -# License: This file is licensed under the GPL v2. +# License: Distributed under the same BSD-ish license as zsh itself. ################################################################################ # adam3 prompt theme -- cgit v1.2.3