Merge lp:~stewart/drizzle/bug952804 into lp:drizzle

Proposed by Stewart Smith on 2013-08-08
Status: Merged
Merged at revision: 2639
Proposed branch: lp:~stewart/drizzle/bug952804
Merge into: lp:drizzle
Diff against target: 135 lines (+0/-120)
2 files modified
EXCEPTIONS-CLIENT (+0/-119)
Makefile.am (+0/-1)
To merge this branch: bzr merge lp:~stewart/drizzle/bug952804
Reviewer Review Type Date Requested Status
Drizzle Trunk 2013-08-08 Pending
Review via email: mp+179097@code.launchpad.net

Description of the change

Simple removal of EXCEPTIONS_CLIENT which hasn't applied for years.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'EXCEPTIONS-CLIENT'
--- EXCEPTIONS-CLIENT 2012-05-02 10:27:13 +0000
+++ EXCEPTIONS-CLIENT 1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
1MySQL FLOSS License Exception
2
3The MySQL AB Exception for Free/Libre and Open Source
4Software-only Applications Using MySQL Client Libraries (the
5"FLOSS Exception").
6
7Version 0.6, 7 March 2007
8
9Exception Intent
10
11We want specified Free/Libre and Open Source Software (``FLOSS'')
12applications to be able to use specified GPL-licensed MySQL client
13libraries (the ``Program'') despite the fact that not all FLOSS
14licenses are compatible with version 2 of the GNU General Public
15License (the ``GPL'').
16
17Legal Terms and Conditions
18
19As a special exception to the terms and conditions of version 2.0
20of the GPL:
21
22 1. You are free to distribute a Derivative Work that is formed
23 entirely from the Program and one or more works (each, a
24 "FLOSS Work") licensed under one or more of the licenses
25 listed below in section 1, as long as:
26 a. You obey the GPL in all respects for the Program and the
27 Derivative Work, except for identifiable sections of the
28 Derivative Work which are not derived from the Program,
29 and which can reasonably be considered independent and
30 separate works in themselves,
31 b. all identifiable sections of the Derivative Work which
32 are not derived from the Program, and which can
33 reasonably be considered independent and separate works
34 in themselves,
35 i. are distributed subject to one of the FLOSS licenses
36 listed below, and
37 ii. the object code or executable form of those sections
38 are accompanied by the complete corresponding
39 machine-readable source code for those sections on
40 the same medium and under the same FLOSS license as
41 the corresponding object code or executable forms of
42 those sections, and
43 c. any works which are aggregated with the Program or with a
44 Derivative Work on a volume of a storage or distribution
45 medium in accordance with the GPL, can reasonably be
46 considered independent and separate works in themselves
47 which are not derivatives of either the Program, a
48 Derivative Work or a FLOSS Work.
49 If the above conditions are not met, then the Program may only
50 be copied, modified, distributed or used under the terms and
51 conditions of the GPL or another valid licensing option from
52 MySQL AB.
53
54 2. FLOSS License List
55
56License name Version(s)/Copyright Date
57Academic Free License 2.0
58Apache Software License 1.0/1.1/2.0
59Apple Public Source License 2.0
60Artistic license From Perl 5.8.0
61BSD license "July 22 1999"
62Common Development and Distribution License (CDDL) 1.0
63Common Public License 1.0
64Eclipse Public License 1.0
65GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1
66Jabber Open Source License 1.0
67MIT license (As listed in file MIT-License.txt) ---
68Mozilla Public License (MPL) 1.0/1.1
69Open Software License 2.0
70OpenSSL license (with original SSLeay license) "2003" ("1998")
71PHP License 3.0
72Python license (CNRI Python License) ---
73Python Software Foundation License 2.1.1
74Sleepycat License "1999"
75University of Illinois/NCSA Open Source License ---
76W3C License "2001"
77X11 License "2001"
78Zlib/libpng License ---
79Zope Public License 2.0
80
81 Due to the many variants of some of the above licenses, we
82 require that any version follow the 2003 version of the Free
83 Software Foundation's Free Software Definition
84 (http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of
85 the Open Source Definition by the Open Source Initiative
86 (http://www.opensource.org/docs/definition.php).
87
88 3. Definitions
89
90 a. Terms used, but not defined, herein shall have the
91 meaning provided in the GPL.
92 b. Derivative Work means a derivative work under copyright
93 law.
94
95 4. Applicability: This FLOSS Exception applies to all Programs
96 that contain a notice placed by MySQL AB saying that the
97 Program may be distributed under the terms of this FLOSS
98 Exception. If you create or distribute a work which is a
99 Derivative Work of both the Program and any other work
100 licensed under the GPL, then this FLOSS Exception is not
101 available for that work; thus, you must remove the FLOSS
102 Exception notice from that work and comply with the GPL in all
103 respects, including by retaining all GPL notices. You may
104 choose to redistribute a copy of the Program exclusively under
105 the terms of the GPL by removing the FLOSS Exception notice
106 from that copy of the Program, provided that the copy has
107 never been modified by you or any third party.
108
109Appendix A. Qualified Libraries and Packages
110
111The following is a non-exhaustive list of libraries and packages
112which are covered by the FLOSS License Exception. Please note that
113this appendix is provided merely as an additional service to
114specific FLOSS projects wishing to simplify licensing information
115for their users. Compliance with one of the licenses noted under
116the "FLOSS license list" section remains a prerequisite.
117
118Package Name Qualifying License and Version
119Apache Portable Runtime (APR) Apache Software License 2.0
1200
=== modified file 'Makefile.am'
--- Makefile.am 2013-04-24 08:07:04 +0000
+++ Makefile.am 2013-08-08 05:45:58 +0000
@@ -75,7 +75,6 @@
75 COPYING.Boost \75 COPYING.Boost \
76 COPYING.BSD \76 COPYING.BSD \
77 DRIZZLE.FAQ \77 DRIZZLE.FAQ \
78 EXCEPTIONS-CLIENT \
79 config/autorun.sh \78 config/autorun.sh \
80 config/config.rpath \79 config/config.rpath \
81 config/drizzle.ver \80 config/drizzle.ver \

Subscribers

People subscribed via source and target branches

to all changes: