[Supervisor-checkins] r872 - supervisor/trunk

[Mike Naberezny]

Author: Mike Naberezny <mike at maintainable.com>
Date: Tue May 26 12:26:15 2009
New Revision: 872

Log:
Added bundled Medusa to the license and copyright lists.

Modified:
   supervisor/trunk/COPYRIGHT.txt
   supervisor/trunk/LICENSES.txt

Modified: supervisor/trunk/COPYRIGHT.txt
==============================================================================
--- supervisor/trunk/COPYRIGHT.txt	(original)
+++ supervisor/trunk/COPYRIGHT.txt	Tue May 26 12:26:15 2009
@@ -18,6 +18,8 @@
   WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
   FOR A PARTICULAR PURPOSE. 
 
+medusa was (is?) Copyright (c) Sam Rushing.
+
 http_client.py code Copyright (c) by Daniel Krech, http://eikeon.com/.
 
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

Modified: supervisor/trunk/LICENSES.txt
==============================================================================
--- supervisor/trunk/LICENSES.txt	(original)
+++ supervisor/trunk/LICENSES.txt	Tue May 26 12:26:15 2009
@@ -75,6 +75,36 @@
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Medusa, the asynchronous communications framework upon which
+supervisor's server and client code is based, was created by Sam
+Rushing:
+
+  Medusa was once distributed under a 'free for non-commercial use'
+  license, but in May of 2000 Sam Rushing changed the license to be
+  identical to the standard Python license at the time.  The standard
+  Python license has always applied to the core components of Medusa,
+  this change just frees up the rest of the system, including the http
+  server, ftp server, utilities, etc.  Medusa is therefore under the
+  following license:
+
+  ============================== 
+  Permission to use, copy, modify, and distribute this software and
+  its documentation for any purpose and without fee is hereby granted,
+  provided that the above copyright notice appear in all copies and
+  that both that copyright notice and this permission notice appear in
+  supporting documentation, and that the name of Sam Rushing not be
+  used in advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+  NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+  WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  ==============================
+
 Some software in this distribution is released under the Zope Public
 License (as marked in its file header):