summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Forsyth <charles.forsyth@gmail.com>2021-03-12 12:40:58 +0000
committerCharles Forsyth <charles.forsyth@gmail.com>2021-03-12 12:40:58 +0000
commit1b2614f99767317f75ba698e8fa1c3c93fa902f7 (patch)
tree7a20ec96aab6527b3cbe4807a041592474296467
parent871e0f01ca6cdef953c81d1a5018d90fbd01838a (diff)
remove obsolete NOTICE prototypes. add lib/legal/README to explain why the other files are there
-rw-r--r--lib/legal/NOTICE.app4
-rw-r--r--lib/legal/NOTICE.ffal34
-rw-r--r--lib/legal/NOTICE.gpl25
-rw-r--r--lib/legal/NOTICE.lgpl25
-rw-r--r--lib/legal/NOTICE.liberal38
-rw-r--r--lib/legal/README4
6 files changed, 4 insertions, 126 deletions
diff --git a/lib/legal/NOTICE.app b/lib/legal/NOTICE.app
deleted file mode 100644
index a0f7a41c..00000000
--- a/lib/legal/NOTICE.app
+++ /dev/null
@@ -1,4 +0,0 @@
-This Inferno® software distribution is subject to your Inferno system and application commercial licence(s).
-It must not be used except as allowed by that licence.
-It must not be redistributed outside your organisation unless otherwise agreed,
-or deployed in greater numbers than allowed by your licence.
diff --git a/lib/legal/NOTICE.ffal b/lib/legal/NOTICE.ffal
deleted file mode 100644
index 809bc2f3..00000000
--- a/lib/legal/NOTICE.ffal
+++ /dev/null
@@ -1,34 +0,0 @@
-This copyright NOTICE applies to all files in this directory and
-subdirectories, unless another copyright notice appears in a given
-file or subdirectory. If you take substantial code from this software to use in
-other programs, you must somehow include with it an appropriate
-copyright notice that includes the copyright notice and the other
-notices below. It is fine (and often tidier) to do that in a separate
-file such as NOTICE, LICENCE or COPYING.
-
- Copyright © 1994-1999 Lucent Technologies Inc. All rights reserved.
- Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
- Portions Copyright © 1997-1999 Vita Nuova Limited
- Portions Copyright © 2000-2005 Vita Nuova Holdings Limited (www.vitanuova.com)
- Portions Copyright © 2004,2005 Bruce Ellis
- Portions Copyright © 2005 C H Forsyth (forsyth@terzarima.net)
- Revisions Copyright © 2000-2005 Lucent Technologies Inc. and others
-
-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
-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.
-
diff --git a/lib/legal/NOTICE.gpl b/lib/legal/NOTICE.gpl
deleted file mode 100644
index 3fbc79b8..00000000
--- a/lib/legal/NOTICE.gpl
+++ /dev/null
@@ -1,25 +0,0 @@
-This copyright NOTICE applies to all files in this directory and
-subdirectories, unless another copyright notice appears in a given
-file or subdirectory. If you take substantial code from this software to use in
-other programs, you must somehow include with it an appropriate
-copyright notice that includes the copyright notice and the other
-notices below. It is fine (and often tidier) to do that in a separate
-file such as NOTICE, LICENCE or COPYING.
-
-Copyright © 1995-1999 Lucent Technologies Inc.
-Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2005 Vita Nuova Holdings Limited
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/lib/legal/NOTICE.lgpl b/lib/legal/NOTICE.lgpl
deleted file mode 100644
index a0f8f9f3..00000000
--- a/lib/legal/NOTICE.lgpl
+++ /dev/null
@@ -1,25 +0,0 @@
-This copyright NOTICE applies to all files in this directory and
-subdirectories, unless another copyright notice appears in a given
-file or subdirectory. If you take substantial code from this software to use in
-other programs, you must somehow include with it an appropriate
-copyright notice that includes the copyright notice and the other
-notices below. It is fine (and often tidier) to do that in a separate
-file such as NOTICE, LICENCE or COPYING.
-
-Copyright © 1995-1999 Lucent Technologies Inc.
-Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2005 Vita Nuova Holdings Limited
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License (`LGPL') as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/lib/legal/NOTICE.liberal b/lib/legal/NOTICE.liberal
deleted file mode 100644
index 22050df6..00000000
--- a/lib/legal/NOTICE.liberal
+++ /dev/null
@@ -1,38 +0,0 @@
-This Inferno® distribution includes software from various sources and
-different portions are therefore subject to different licence terms.
-
-You may copy and redistribute the package as a whole,
-with or without modification, subject to the terms of the Vita Nuova
-Liberal Source Licence (see the file LICENCE), which applies to the
-package as a whole, and to individual components unless otherwise
-specified either in an individual source file or in a NOTICE file
-in a directory or directory tree. If the terms of that licence are not acceptable,
-you must negotiate other terms with Vita Nuova (www.vitanuova.com).
-
-Individual components (eg, some of the libraries, Freetype, and the
-B&H fonts) might have their own NOTICE and licence files (LICENCE or
-COPYING) that cover their content. Be sure to read them before
-considering redistribution of them on their own.
-With the exception of the B&H font licence, each is typically
-some variety of Free Software licence.
-
-Where a given section of source code is distributed elsewhere (as a separable component) under
-another licence or licences, and we include it here as well under ours, you can obviously
-regard it as subject to whichever licence you like.
-
-When making non-trivial extracts, or your own modifications, you must
-retain the copyright of the original source file or files (either that
-present in the file or in a NOTICE file covering the directory or
-directories in which the file resides).
-
-The following copyright notice covers the contents of this
-distribution unless otherwise specified by a given file, directory, or
-directory tree:
-
-Inferno® Copyright © 1996-1999 Lucent Technologies Inc. All rights reserved.
-Inferno revisions Copyright © 1997-1999 Vita Nuova Limited. All rights reserved.
-Inferno revisions Copyright © 2000-2003 Vita Nuova Holdings Limited. All rights reserved.
-Inferno new material Copyright © 2000-2003 Vita Nuova Holdings Limited. All rights reserved.
-
-Inferno, Styx, Dis and Limbo are registered trademarks of Vita Nuova Holdings Limited in the USA and other countries.
-Plan 9 is a registered trademark of Lucent Technologies Inc.
diff --git a/lib/legal/README b/lib/legal/README
new file mode 100644
index 00000000..798792c8
--- /dev/null
+++ b/lib/legal/README
@@ -0,0 +1,4 @@
+Files with the text of non-MIT licences that apply to some files and directories in this distribution,
+as specified by the relevant NOTICE files in the parent directories or by a copyright notice in a source file.
+
+See /NOTICE for the copyright and licence ("MIT licence") that apply in the absence of any other NOTICE.