[Python-checkins] CVS: python/dist/src LICENSE,1.5,1.6

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv16644

Modified Files:
	LICENSE 
Log Message:
Since it looks like the dual license clause may be neither necessary
nor sufficient to make Python 2.0 compatible with the GPL, we won't
bother with it now.

In other words, we're still where we were weeks ago -- CNRI believes
that its license is GPL-compatible, Stallman says it's not.  I'm
trying to arrange a meeting between their lawyers so they can work it
out.  Whether dual licensing is the solution is open at this point.
If it is the (only!) solution, we'll add that to the BeOpen license
for 2.0 final.


Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** LICENSE	2000/09/04 00:58:48	1.5
--- LICENSE	2000/09/05 03:05:07	1.6
***************
*** 37,47 ****
  Software, alone or in any derivative version prepared by Licensee.
  
! 3. Instead of using this License, you can redistribute and/or modify
! the Software under the terms of the GNU General Public License as
! published by the Free Software Foundation; either version 2, or (at
! your option) any later version.  For a copy of the GPL, see
! http://www.gnu.org/copyleft/gpl.html.
! 
! 4. BeOpen is making the Software available to Licensee on an "AS IS"
  basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
  IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
--- 37,41 ----
  Software, alone or in any derivative version prepared by Licensee.
  
! 3. BeOpen is making the Software available to Licensee on an "AS IS"
  basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
  IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
***************
*** 50,62 ****
  INFRINGE ANY THIRD PARTY RIGHTS.
  
! 5. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
  SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
  AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
  DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
  
! 6. This License Agreement will automatically terminate upon a material
  breach of its terms and conditions.
  
! 7. This License Agreement shall be governed by and interpreted in all
  respects by the law of the State of California, excluding conflict of
  law provisions.  Nothing in this License Agreement shall be deemed to
--- 44,56 ----
  INFRINGE ANY THIRD PARTY RIGHTS.
  
! 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
  SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
  AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
  DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
  
! 5. This License Agreement will automatically terminate upon a material
  breach of its terms and conditions.
  
! 6. This License Agreement shall be governed by and interpreted in all
  respects by the law of the State of California, excluding conflict of
  law provisions.  Nothing in this License Agreement shall be deemed to
***************
*** 69,73 ****
  permissions granted on that web page.
  
! 8. By copying, installing or otherwise using the software, Licensee
  agrees to be bound by the terms and conditions of this License
  Agreement.
--- 63,67 ----
  permissions granted on that web page.
  
! 7. By copying, installing or otherwise using the software, Licensee
  agrees to be bound by the terms and conditions of this License
  Agreement.