Skip to content

Commit

Permalink
Update the image license files (#1413)
Browse files Browse the repository at this point in the history
* FIX : Update the image license file

	modified:   image_LICENSE.txt

* DEV : Remove images under integrationtests dir

because the images are works of enthought, they are already covered by
the text of the image license file.

	modified:   image_LICENSE.txt

* FIX : Remove all Enthought licensed images

	modified:   image_LICENSE.txt

* DEV : Add license info for traitsui/wx/images

and remove the image_LICENSE.txt file that lives in traitsui/wx/images

	modified:   image_LICENSE.txt
	deleted:    traitsui/wx/images/image_LICENSE.txt

* DEV : Add license for traitsui/qt4/images

and remove the image license file in traitsui/qt4/images

	modified:   image_LICENSE.txt
	deleted:    traitsui/qt4/images/image_LICENSE.txt

* CLN : Remove traitsui/images image license file

this file can be removed because unless otherwise specified, all images
in the codebase are enthought licensed

	deleted:    traitsui/images/image_LICENSE.txt

* CLN : Remove image license for traitsui/image/library

this can be removed because the main license file states that unless
otherwise specified, images are Enthought licensed.

	deleted:    traitsui/image/library/image_LICENSE.txt

* DEV : Add license info for traitsui/extras/images

	modified:   image_LICENSE.txt
	deleted:    traitsui/extras/images/image_LICENSE.txt

* CLN : Remove a redundant license file

	deleted:    traitsui/examples/demo/image_LICENSE.txt

* CLN : Remove another redundant image license file

	deleted:    traitsui/examples/demo/Extras/images/image_LICENSE.txt

* CLN : Remove another redundant image license file

the only image that is Nuvola licensed is also listed in the main/top
level image license file so this file can be removed

	deleted:    traitsui/examples/demo/Applications/images/image_LICENSE.txt

* FIX : Add image_LICENSE_OOo license file

and ship it with the distribution

	new file:   image_LICENSE_OOo.txt
	modified:   MANIFEST.in

* CLN : Remove one more redundant license file

	deleted:    docs/source/tutorials/images/image_LICENSE.txt
  • Loading branch information
Poruri Sai Rahul authored Nov 27, 2020
1 parent e14ca3e commit 7a7ac43
Show file tree
Hide file tree
Showing 12 changed files with 93 additions and 255 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include README_example.png
include image_LICENSE.txt
include image_LICENSE_Eclipse.txt
include image_LICENSE_Nuvola.txt
include image_LICENSE_OOo.txt
include TODO.txt
graft docs
prune docs/build
Expand Down
21 changes: 0 additions & 21 deletions docs/source/tutorials/images/image_LICENSE.txt

This file was deleted.

102 changes: 27 additions & 75 deletions image_LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,92 +5,44 @@ Project License File
----------------------------------------------------------------------------
Eclipse Eclipse Public License image_LICENSE_Eclipse.txt
Enthought BSD 3-Clause LICENSE.txt
GV (Gael Varoquaux) Public Domain N/A
Qt GNU LGPL 2.1
Nuvola LGPL image_LICENSE_Nuvola.txt
OOo LGPL image_LICENSE_OOo.txt

Unless stated in this file, icons are the work of Enthought, and are
released under a 3 clause BSD license.

Files and original authors:
----------------------------------------------------------------------------
docs/source/tutorials/images:
application1.png | Enthought
application2.png | Enthought
application3.png | Enthought
code_block1.png | Enthought
container.png | Enthought
interactive.png | Enthought
mpl_figure_editor.png | Enthought
traits_thread.png | Enthought

traitsui/image/library:
std.zip | Enthought

traitsui/images:
array_node.png | Enthought
bool_node.png | Enthought
class_node.png | Eclipse
complex_node.png | Enthought
dialog_warning.png | Nuvola
dict_node.png | Enthought
float_node.png | Enthought
folder-new.png | Nuvola
function_node.png | Eclipse
int_node.png | Enthought
list_node.png | Enthought
method_node.png | Eclipse
none_node.png | Nuvola
object_node.png | Eclipse
other_node.png | Enthought
set_node.png | Enthought
std_horizontal_drag.png | Enthought
std_horizontal_splitter.png | Enthought
std_tab_active.png | Enthought
std_tab_background.png | Enthought
std_tab_hover.png | Enthought
std_tab_inactive.png | Enthought
std_tab.png | Enthought
std_vertical_drag.png | Enthought
std_vertical_splitter.png | Enthought
string_node.png | Enthought
traits_node.png | Eclipse
tuple_node.png | Enthought

examples/demo/:
traits_ui_demo.jpg | Enthought

examples/demo/Advanced/images:
red_flag.png | Nuvola

examples/demo/Applications/images:
traitsui/examples/demo/Applications/images:
blue_ball.png | Nuvola
GG5.png | Enthought
header.png | Enthought
notebook_close.png | Enthought
notebook_open.png | Enthought
red_ball.png | Enthought
TFB.png | Enthought

examples/demo/Extras/images:
info.png | Enthought
logo_32x32.gif | Enthought
logo_48x48.gif | Enthought
logo_64x64.gif | Enthought

examples/demo/Standard_Editors/images:
bottom_left_origin.gif | Enthought
bottom_right_origin.gif | Enthought
top_left_origin.gif | Enthought
top_right_origin.gif | Enthought

examples/demo/Standard_Editors/Popup_versions/images:
bottom_left_origin.gif | Enthought
bottom_right_origin.gif | Enthought
top_left_origin.gif | Enthought
top_right_origin.gif | Enthought

examples/tutorials/images:
traitsui/extras/images:
next.png | Nuvola
parent.png | Nuvola
previous.png | Nuvola
reload.png | Nuvola
run.png | Nuvola

traitsui/qt4/images:
closetab.png | Qt
next.png | Qt
previous.png | Qt

traitsui/wx/images:
group.png | Nuvola
item.png | Eclipse
open.png | Nuvola
table_add.png | OOo
table_colors.png | GV
table_delete.png | OOo
table_delete_synthetic.png | OOo
table_display.png | OOo
table_move_down.png | GV
table_move_up.png | GV
table_no_sort.png | OOo
table_prefs.png | OOo
table_search.png | OOo
table_synthetic.png | OOo
table_undelete.png | OOo
65 changes: 65 additions & 0 deletions image_LICENSE_OOo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
GNU LESSER GENERAL PUBLIC LICENSE

Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>

Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
0. Additional Definitions.

As used herein, �this License� refers to version 3 of the GNU Lesser General Public License, and the �GNU GPL� refers to version 3 of the GNU General Public License.

�The Library� refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.

An �Application� is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.

A �Combined Work� is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the �Linked Version�.

The �Minimal Corresponding Source� for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.

The �Corresponding Application Code� for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.

You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.

If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:

* a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
* b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.

The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:

* a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
* b) Accompany the object code with a copy of the GNU GPL and this license document.

4. Combined Works.

You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:

* a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
* b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
* c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
* d) Do one of the following:
o 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
o 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
* e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)

5. Combined Libraries.

You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:

* a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
* b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.

The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License �or any later version� applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
21 changes: 0 additions & 21 deletions traitsui/examples/demo/Applications/images/image_LICENSE.txt

This file was deleted.

18 changes: 0 additions & 18 deletions traitsui/examples/demo/Extras/images/image_LICENSE.txt

This file was deleted.

14 changes: 0 additions & 14 deletions traitsui/examples/demo/image_LICENSE.txt

This file was deleted.

18 changes: 0 additions & 18 deletions traitsui/extras/images/image_LICENSE.txt

This file was deleted.

14 changes: 0 additions & 14 deletions traitsui/image/library/image_LICENSE.txt

This file was deleted.

14 changes: 0 additions & 14 deletions traitsui/images/image_LICENSE.txt

This file was deleted.

19 changes: 0 additions & 19 deletions traitsui/qt4/images/image_LICENSE.txt

This file was deleted.

Loading

0 comments on commit 7a7ac43

Please sign in to comment.