summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-07-08 07:26:43 -0700
committerKaz Kylheku <kaz@kylheku.com>2014-07-08 09:27:28 -0700
commit0a7ba78d65499ec2a911823bec94988e06c2539f (patch)
tree5cd9dd0122a9a17bd432687b29dae162820d1389
parent71cc1d5902abb8cc005114f28a5cea8d766a4b05 (diff)
downloadtxr-0a7ba78d65499ec2a911823bec94988e06c2539f.tar.gz
txr-0a7ba78d65499ec2a911823bec94988e06c2539f.tar.bz2
txr-0a7ba78d65499ec2a911823bec94988e06c2539f.zip
* LICENSE: Adding copyright for MPI Library.
* METALICENSE: Adding notes about MPI.
-rw-r--r--ChangeLog6
-rw-r--r--LICENSE4
-rw-r--r--METALICENSE15
3 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 58abab14..a137a4f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-08 Kaz Kylheku <kaz@kylheku.com>
+
+ * LICENSE: Adding copyright for MPI Library.
+
+ * METALICENSE: Adding notes about MPI.
+
2014-07-07 Kaz Kylheku <kaz@kylheku.com>
* Makefile: install the LICENSE and METALICENSE files into the data
diff --git a/LICENSE b/LICENSE
index ad961ae5..da1dc503 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,6 @@
-Copyright (C) 2009-2014, Kaz Kylheku <kaz@kylheku.com>.
+TXR is copyright (C) 2009-2014, Kaz Kylheku.
+The MPI Library is copyright (C) 2002 Michael J. Fromberger.
+
All rights reserved.
Please see the document METALICENSE for notes about this license.
diff --git a/METALICENSE b/METALICENSE
index c6e8d9b8..fc8b571c 100644
--- a/METALICENSE
+++ b/METALICENSE
@@ -33,3 +33,18 @@ differences between the TXR LICENSE file and the BSD license.
4. The disclaimer is substantially abridged from the verbose original.
Interested parties are hereby encouraged to research the differences.
+
+Regarding the MPI library, the README file in the mpi-1.8.6.tar.gz
+archive states:
+
+ This software is in the public domain. It is entirely free, and you
+ may use it and/or redistribute it for whatever purpose you choose;
+ however, as free software, it is provided without warranty of any
+ kind, not even the implied warranty of merchantability or fitness for
+ a particular purpose.
+
+Whether or not software can be explicitly deposited into the public domain is
+legally questionable, so the MPI library must be regarded as being copyrighted
+by Michael J. Fromberger. The above text can be reasonably understood to
+constitute a license which is compatible with the TXR LICENSE file
+in the sense that it is at least as permissive.