[gentoo-commits] gentoo-x86 commit in licenses: pymol

[Justin Lecher (jlec)]

jlec        10/02/06 20:40:40

  Modified:             pymol
  Log:
  pymol license updated to new version

Revision  Changes    Path
1.2                  licenses/pymol

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/licenses/pymol?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/licenses/pymol?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/licenses/pymol?r1=1.1&r2=1.2

Index: pymol
===================================================================
RCS file: /var/cvsroot/gentoo-x86/licenses/pymol,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pymol	1 Jul 2007 21:50:56 -0000	1.1
+++ pymol	6 Feb 2010 20:40:40 -0000	1.2
@@ -1,52 +1,50 @@
 
-Open-Source PyMOL Copyright Notice
-==================================
+ Open-Source PyMOL Copyright Notice
+ ==================================
 
-The Open-Source PyMOL source code is copyrighted, but you can freely
-use and copy it as long as you don't change or remove any of the
-Copyright notices.  The Open-Source PyMOL product is made available
-under the following open-source license terms:
-
-----------------------------------------------------------------------
-Open-Source PyMOL is Copyright (C) 1998-2003 Warren L. DeLano and 
-Copyright (C) 2003-2007 DeLano Scientific LLC, Palo Alto,
-California, U.S.A., (www.delanoscientific.com).
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, distribute, and distribute modified
-versions of this software and its built-in documentation for any
-purpose and without fee is hereby granted, provided that the above
-copyright notice appears in all copies and that both the copyright
-notice and this permission notice appear in supporting documentation,
-and that the names of Warren L. DeLano or DeLano Scientific LLC not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-WARREN LYFORD DELANO AND DELANO SCIENTIFIC LLC DISCLAIM ALL WARRANTIES 
-WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL WARREN LYFORD DELANO
-OR DELANO SCIENTIFIC LLC 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.
-----------------------------------------------------------------------
-
-PyMOL Trademark Notice
-======================
-
-PyMOL(TM) is a trademark of DeLano Scientific LLC.  Derivative
-software which contains PyMOL source code must be plainly
-distinguished from any and all PyMOL products distributed by DeLano
-Scientific LLC in all publicity, advertising, and documentation.
-
-The slogans, "Includes PyMOL(TM).", "Based on PyMOL(TM) technology.",
-"Contains PyMOL(TM) source code.", and "Built using PyMOL(TM).", may
-be used in advertising, publicity, and documentation of derivative
-software provided that the notice, "PyMOL is a trademark of DeLano
-Scientific LLC.", is included in a footnote or at the end of the
-document.
+ The Open-Source PyMOL source code is copyrighted, but you can freely
+ use and copy it as long as you don't change or remove any of the
+ Copyright notices. The Open-Source PyMOL product is made available
+ under the following open-source license terms:
+
+ ----------------------------------------------------------------------
+ Open-Source PyMOL is Copyright (C) Schrodinger, LLC.
+
+ All Rights Reserved
+
+ Permission to use, copy, modify, distribute, and distribute modified
+ versions of this software and its built-in documentation for any
+ purpose and without fee is hereby granted, provided that the above
+ copyright notice appears in all copies and that both the copyright
+ notice and this permission notice appear in supporting documentation,
+ and that the name of Schrodinger, LLC not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission.
+
+ SCHRODINGER, LLC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
+ NO EVENT SHALL SCHRODINGER, LLC 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.
+ ----------------------------------------------------------------------
+
+ PyMOL Trademark Notice
+ ======================
+
+ PyMOL(TM) is a trademark of Schrodinger, LLC. Derivative
+ software which contains PyMOL source code must be plainly
+ distinguished from any and all PyMOL products distributed by Schrodinger,
+ LLC in all publicity, advertising, and documentation.
+
+ The slogans, "Includes PyMOL(TM).", "Based on PyMOL(TM) technology.",
+ "Contains PyMOL(TM) source code.", and "Built using PyMOL(TM).", may
+ be used in advertising, publicity, and documentation of derivative
+ software provided that the notice, "PyMOL is a trademark of Schrodinger,
+ LLC.", is included in a footnote or at the end of the
+ document.
+
+ All other endorsements employing the PyMOL trademark require specific,
+ written prior permission.
 
-All other endorsements employing the PyMOL trademark require specific,
-written prior permission.