From 04ece369962f5521f08bf8148d8365ba973085c0 Mon Sep 17 00:00:00 2001 From: Ari Johnson Date: Thu, 14 Jun 2007 15:33:02 +0000 Subject: [PATCH] Updated copyright notice file; still needs specific license terms for CobraMUSH (grep for 'TODO' in COPYRITE) (cherry picked from commit 367f108a7ae1a66f42e84005296697f1b814fd3e) --- COPYRITE | 79 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/COPYRITE b/COPYRITE index ee68087..b5631d8 100644 --- a/COPYRITE +++ b/COPYRITE @@ -1,32 +1,39 @@ /* copyrite.h */ /* - * Copyright, License, and Credits for PennMUSH 1.x. Revised MARCH 2006 + * Copyright, License, and Credits for CobraMUSH. * * I. Copyrights * - * PennMUSH 1.x - * Copyright (c) 1995-2006, T. Alexander Popiel and - * Shawn Wagner . - * - * Some code used in this server may have been derived from the - * TinyMUSH 2.2 source code, with permission. TinyMUSH 2.2 is - * Copyright (c) 1994-2002, Jean Marie Diaz, Lydia Leong, and Devin Hooker. - * - * Some code used in this server may have been directive from TinyMUSH 2.0. - * Copyright (c) 1995, Joseph Traub, Glenn Crocker. + * CobraMUSH + * Copyright (C) 2002-2007, Rick Bird and + * Ari Johnson . * - * Some code used in this server may have been directive from TinyMUD. - * Copyright (c) 1995, David Applegate, James Aspnes, Timothy Freeman - * and Bennet Yee. + * Some portions of CobraMUSH originate with PennMUSH. Please see + * http://www.pennmush.org/ for full copyright information for + * PennMUSH. As of this writing, PennMUSH and all portions thereof + * incorporated into CobraMUSH was copyright (C) 1995-2006, + * T. Alexander Popiel and Shawn Wagner + * . * - *------------------------------------------------------------------------* + * Some PennMUSH code incorporated into CobraMUSH may, as per the + * PennMUSH copyright notice, be derived from TinyMUSH 2.2, with + * permission. TinyMUSH 2.2 is copyright (C) 1994-2002, + * Jean Marie Diaz, Lydia Leong, and Devin Hooker. Some PennMUSH + * code incorporated into CobraMUSH may, as per the PennMUSH copyright + * notice, be derived from TinyMUSH 2.0. TinyMUSH 2.0 is copyright + * (C) 1995, Joseph Traub and Glenn Crocker. Some PennMUSH code + * incorporated into CobraMUSH may, as per the PennMUSH copyright + * notice, be derived from TinyMUD. TinyMUD is copyright (C) 1995, + * David Applegate, James Aspnes, Timothy Freeman, and Bennet Yee. * * II. License * - * Because PennMUSH includes parts of multiple works, you must comply - * with all of the relevant licenses of those works. The portions derived - * from TinyMUD/TinyMUSH 2.0 are licensed under the following terms: + * CobraMUSH includes portions of several other works. Therefore, + * in order to comply with a license relating to CobraMUSH you must + * also comply with the relevant licenses of those works. The + * portions derived from TinyMUD and TinyMUSH 2.0 are licensed + * under the following terms: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that: (1) source code distributions @@ -41,9 +48,8 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * The portions derived from TinyMUSH 2.2 are used under the Artistic - * License. The Artistic License is also the license under which you - * are granted permission to copy and modify PennMUSH: + * The portions derived from TinyMUSH 2.2 and PennMUSH are licensed + * under the Artistic License, as follows: * * The Artistic License * @@ -147,25 +153,26 @@ * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * The End + * + * The CobraMUSH developers have made distribution arrangements with the + * copyright holders of PennMUSH, pursuant to clause 3(d) of the Artistic + * License. + * + * Those parts of CobraMUSH not derived from outside sources are + * distributed subject to the following license: + * TODO * *---------------------------------------------------------------------* * * III. Credits * - * Many people have helped develop PennMUSH. In addition to the people - * listed above, and the many people noted in the CHANGES file - * for suggestions and patches, special mention is due to: - * - * Past and present PennMUSH development team members: - * T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard, - * Shawn Wagner, Ervin Hearn III, Greg Millam, Alan "Javelin" Schwartz - * Past and present PennMUSH porters: - * Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III - * TinyMUSH 2.2, TinyMUSH 3.0, TinyMUX 2, and RhostMUSH developers - * All PennMUSH users who've sent in bug reports and patches - * The admin and players of DuneMUSH, Dune II, M*U*S*H, Rio:MdC, - * and other places Javelin has beta-tested new versions - * Lydia Leong (Amberyl), who maintained PennMUSH until 1995, and taught - * Javelin how to be a Wizard and a God of a MUSH. + * CobraMUSH is the product of concerted efforts by a core team of + * developers. Substantial contributors to CobraMUSH are: + * Rick Bird + * Ari Johnson + * Jamie Warren * + * Please refer to other documents for credits relating to the portions + * of CobraMUSH derived from or inspired by PennMUSH, TinyMUSH 2.0, + * TinyMUSH 2.2, or TinyMUD. */ -- 2.30.2