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

Subscribers

People subscribed via source and target branches

to all changes: