[cairo-commit] pycairo ChangeLog, 1.27, 1.28 COPYING, 1.1, 1.2 Makefile.am, 1.7, 1.8

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo
In directory gabe:/tmp/cvs-serv20351

Modified Files:
	ChangeLog COPYING Makefile.am 
Log Message:
SC 30/11/2004

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog	28 Nov 2004 08:56:59 -0000	1.27
+++ ChangeLog	30 Nov 2004 01:56:30 -0000	1.28
@@ -1,3 +1,9 @@
+2004-11-30  Steve Chaplin  <steve1097 at yahoo.com.au>
+
+	* COPYING: Changed to reference LGPL and MPL
+	* COPYING-LGPL-2.1, COPYING-MPL-1.1: new files
+	* Makefile.am (EXTRA_DIST): add COPYING*
+
 2004-11-28  Steve Chaplin  <steve1097 at yahoo.com.au>
 
 	* Makefile.am (EXTRA_DIST): add NOTES, examples/context-subclass.py,

Index: COPYING
===================================================================
RCS file: /cvs/cairo/pycairo/COPYING,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- COPYING	17 Sep 2003 14:34:02 -0000	1.1
+++ COPYING	30 Nov 2004 01:56:30 -0000	1.2
@@ -1,21 +1,17 @@
-Copyright © 2003 James Henstridge
+PyCairo is free software.
 
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-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 James Henstridge not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  James Henstridge
-makes no representations about the suitability of this software for
-any purpose.  It is provided "as is" without express or implied
-warranty.
+Every source file in the implementation of PyCairo is available to be
+redistributed and/or modified under the terms of either the GNU Lesser
+General Public License (LGPL) version 2.1 or the Mozilla Public
+License (MPL) version 1.1.  Some files are available under more
+liberal terms, but we believe that in all cases, each file may be used
+under either the LGPL or the MPL.
 
-JAMES HENSTRIDGE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL JAMES HENSTRIDGE 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.
+See the following files in this directory for the precise terms and
+conditions of either license:
+
+	COPYING-LGPL-2.1
+	COPYING-MPL-1.1
 
+Please see each file in the implementation for Copyright and licensing
+information.

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/pycairo/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	28 Nov 2004 08:56:59 -0000	1.7
+++ Makefile.am	30 Nov 2004 01:56:30 -0000	1.8
@@ -2,6 +2,9 @@
 
 EXTRA_DIST = \
   NOTES \
+  COPYING \
+  COPYING-LGPL-2.1 \
+  COPYING-MPL-1.1 \
   examples/cairo-demo.py \
   examples/cairo-knockout.py \
   examples/context-subclass.py \