[Pkg-mono-svn-commits] rev 2452 - mysql-cil/trunk/debian

[D. Moonfire]

Author: dmoonfire-guest
Date: 2006-04-18 01:59:18 +0000 (Tue, 18 Apr 2006)
New Revision: 2452

Modified:
   mysql-cil/trunk/debian/copyright
Log:
Trying to get the copyright cleaned up.


Modified: mysql-cil/trunk/debian/copyright
===================================================================
--- mysql-cil/trunk/debian/copyright	2006-04-15 20:34:46 UTC (rev 2451)
+++ mysql-cil/trunk/debian/copyright	2006-04-18 01:59:18 UTC (rev 2452)
@@ -3,10 +3,24 @@
 
 It was downloaded from http://dev.mysql.com/downloads/connector/net/1.0.html.
 
-Copyright Holder: Copyright (c) 2004 MySQL AB
+Copyright Holder: Copyright (c) 2004-2005 MySQL AB
 
-License: /usr/share/common-licenses/GPL
+License: This library is covered under GPL-2 with the FLOSS exception.
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+     
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+     
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 MySQL FLOSS License Exception
 
 The MySQL AB Exception for Free/Libre and Open Source Software-only
@@ -56,53 +70,5 @@
 modified, distributed or used under the terms and conditions of the GPL or
 another valid licensing option from MySQL AB.
 
-1. FLOSS License List
-
-License name                                       Version(s)/Copyright Date
-Academic Free License                                                    2.0
-Apache Software License                                          1.0/1.1/2.0
-Apple Public Source License                                              2.0
-Artistic license                                             From Perl 5.8.0
-BSD license                                                   "July 22 1999"
-Common Public License                                                    1.0
-GNU Library or "Lesser" General Public License (LGPL)                2.0/2.1
-Jabber Open Source License                                               1.0
-MIT License (As listed in file MIT-License.txt)                            -
-Mozilla Public License (MPL)                                         1.0/1.1
-Open Software License                                                    2.0
-PHP License                                                              3.0
-Python license (CNRI Python License)                                       -
-Python Software Foundation License                                     2.1.1
-Sleepycat License                                                     "1999"
-W3C License                                                           "2001"
-X11 License                                                           "2001"
-Zlib/libpng License                                                        -
-Zope Public License                                                      2.0
-
-Due to the many variants of some of the above licenses, we require that any
-version follow the 2003 version of the Free Software Foundation's Free
-Software Definition (http://www.gnu.org/philosophy/free-sw.html) or version
-1.9 of the Open Source Definition by the Open Source Initiative
-(http://www.opensource.org/docs/definition.php).
-
-2. Definitions
-
-   a. Terms used, but not defined, herein shall have the meaning provided in
-      the GPL.
-
-   b. Derivative Work means a derivative work under copyright law.
-
-3. Applicability
-
-This FLOSS Exception applies to all Programs that contain a notice placed by
-MySQL AB saying that the Program may be distributed under the terms of this
-FLOSS Exception.  If you create or distribute a work which is a Derivative
-Work of both the Program and any other work licensed under the GPL, then
-this FLOSS Exception is not available for that work; thus, you must remove
-the FLOSS Exception notice from that work and comply with the GPL in all
-respects, including by retaining all GPL notices.  You may choose to
-redistribute a copy of the Program exclusively under the terms of the GPL by
-removing the FLOSS Exception notice from that copy of the Program, provided
-that the copy has never been modified by you or any third party.  
-
-$Id: FLOSS-exception.txt,v 1.5 2004/07/15 15:24:19 z Exp $
+Full text of the GPL-2 license may be found at
+/usr/share/common-licenses/GPL-2.