From e95497494f2c0d376c8cdb25548138c5f53cd77c Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 9 Mar 2012 15:36:40 -0800 Subject: Fixup artwork licenses Replace icon files with files from KDE 4.3 Oxygen. Add artwork license info. Signed-off-by: Geoff Levand --- ui/common/Makefile.am | 16 +- ui/common/artwork/COPYING-tux | 10 + ui/common/artwork/cdrom.png | Bin 4848 -> 0 bytes ui/common/artwork/cursor.gz | Bin 9167 -> 0 bytes ui/common/artwork/hdd.png | Bin 4983 -> 0 bytes ui/common/artwork/network.png | Bin 2735 -> 0 bytes ui/common/artwork/oxygen/COPYING-oxygen | 216 +++++++++++++++++++++ ui/common/artwork/oxygen/applications-system.png | Bin 0 -> 4724 bytes ui/common/artwork/oxygen/configure.png | Bin 0 -> 4000 bytes ui/common/artwork/oxygen/drive-harddisk.png | Bin 0 -> 3317 bytes ui/common/artwork/oxygen/drive-optical.png | Bin 0 -> 3491 bytes .../oxygen/drive-removable-media-usb-pendrive.png | Bin 0 -> 2942 bytes ui/common/artwork/oxygen/media-optical.png | Bin 0 -> 5140 bytes ui/common/artwork/oxygen/network-wired.png | Bin 0 -> 2735 bytes ui/common/artwork/oxygen/utilities-terminal.png | Bin 0 -> 2110 bytes ui/common/artwork/system.png | Bin 4650 -> 0 bytes ui/common/artwork/usbpen.png | Bin 5970 -> 0 bytes 17 files changed, 236 insertions(+), 6 deletions(-) create mode 100644 ui/common/artwork/COPYING-tux delete mode 100644 ui/common/artwork/cdrom.png delete mode 100644 ui/common/artwork/cursor.gz delete mode 100644 ui/common/artwork/hdd.png delete mode 100644 ui/common/artwork/network.png create mode 100644 ui/common/artwork/oxygen/COPYING-oxygen create mode 100644 ui/common/artwork/oxygen/applications-system.png create mode 100644 ui/common/artwork/oxygen/configure.png create mode 100644 ui/common/artwork/oxygen/drive-harddisk.png create mode 100644 ui/common/artwork/oxygen/drive-optical.png create mode 100644 ui/common/artwork/oxygen/drive-removable-media-usb-pendrive.png create mode 100644 ui/common/artwork/oxygen/media-optical.png create mode 100644 ui/common/artwork/oxygen/network-wired.png create mode 100644 ui/common/artwork/oxygen/utilities-terminal.png delete mode 100644 ui/common/artwork/system.png delete mode 100644 ui/common/artwork/usbpen.png (limited to 'ui/common') diff --git a/ui/common/Makefile.am b/ui/common/Makefile.am index 034c91b..855dde8 100644 --- a/ui/common/Makefile.am +++ b/ui/common/Makefile.am @@ -48,13 +48,17 @@ artwork = if WITH_TWIN artwork += \ $(srcdir)/artwork/background.jpg \ - $(srcdir)/artwork/cdrom.png \ - $(srcdir)/artwork/cursor.gz \ - $(srcdir)/artwork/hdd.png \ - $(srcdir)/artwork/network.png \ - $(srcdir)/artwork/system.png \ + $(srcdir)/artwork/COPYING-tux \ $(srcdir)/artwork/tux.png \ - $(srcdir)/artwork/usbpen.png + $(srcdir)/artwork/oxygen/applications-system.png \ + $(srcdir)/artwork/oxygen/configure.png \ + $(srcdir)/artwork/oxygen/COPYING-oxygen \ + $(srcdir)/artwork/oxygen/drive-harddisk.png \ + $(srcdir)/artwork/oxygen/drive-optical.png \ + $(srcdir)/artwork/oxygen/drive-removable-media-usb-pendrive.png \ + $(srcdir)/artwork/oxygen/media-optical.png \ + $(srcdir)/artwork/oxygen/network-wired.png \ + $(srcdir)/artwork/oxygen/utilities-terminal.png endif artworkdir = $(pkgdatadir)/artwork/ diff --git a/ui/common/artwork/COPYING-tux b/ui/common/artwork/COPYING-tux new file mode 100644 index 0000000..02b02cb --- /dev/null +++ b/ui/common/artwork/COPYING-tux @@ -0,0 +1,10 @@ +tux.png + +Source: http://www.isc.tamu.edu/~lewing/linux/ +Copyright: 1996 Larry Ewing +License: tux + The copyright holder of this file allows anyone to use it for any purpose, + provided that you acknowledge lewing@isc.tamu.edu and The GIMP if someone + asks. +Comment: This is a cropped version of sit3-shine.7.gif converted to PNG with + original transparent background. diff --git a/ui/common/artwork/cdrom.png b/ui/common/artwork/cdrom.png deleted file mode 100644 index 8b3eeb6..0000000 Binary files a/ui/common/artwork/cdrom.png and /dev/null differ diff --git a/ui/common/artwork/cursor.gz b/ui/common/artwork/cursor.gz deleted file mode 100644 index b73b72f..0000000 Binary files a/ui/common/artwork/cursor.gz and /dev/null differ diff --git a/ui/common/artwork/hdd.png b/ui/common/artwork/hdd.png deleted file mode 100644 index 2b1594c..0000000 Binary files a/ui/common/artwork/hdd.png and /dev/null differ diff --git a/ui/common/artwork/network.png b/ui/common/artwork/network.png deleted file mode 100644 index 2981c5b..0000000 Binary files a/ui/common/artwork/network.png and /dev/null differ diff --git a/ui/common/artwork/oxygen/COPYING-oxygen b/ui/common/artwork/oxygen/COPYING-oxygen new file mode 100644 index 0000000..045b62e --- /dev/null +++ b/ui/common/artwork/oxygen/COPYING-oxygen @@ -0,0 +1,216 @@ +The Oxygen Icon Theme + Copyright (C) 2007 Nuno Pinheiro + Copyright (C) 2007 David Vignoni + Copyright (C) 2007 David Miller + Copyright (C) 2007 Johann Ollivier Lapeyre + Copyright (C) 2007 Kenneth Wimer + Copyright (C) 2007 Riccardo Iaconelli + + +and others + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . + +Clarification: + + The GNU Lesser General Public License or LGPL is written for + software libraries in the first place. We expressly want the LGPL to + be valid for this artwork library too. + + KDE Oxygen theme icons is a special kind of software library, it is an + artwork library, it's elements can be used in a Graphical User Interface, or + GUI. + + Source code, for this library means: + - where they exist, SVG; + - otherwise, if applicable, the multi-layered formats xcf or psd, or + otherwise png. + + The LGPL in some sections obliges you to make the files carry + notices. With images this is in some cases impossible or hardly useful. + + With this library a notice is placed at a prominent place in the directory + containing the elements. You may follow this practice. + + The exception in section 5 of the GNU Lesser General Public License covers + the use of elements of this art library in a GUI. + + kde-artists [at] kde.org + +----- + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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: + + 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. + + 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. diff --git a/ui/common/artwork/oxygen/applications-system.png b/ui/common/artwork/oxygen/applications-system.png new file mode 100644 index 0000000..4a37651 Binary files /dev/null and b/ui/common/artwork/oxygen/applications-system.png differ diff --git a/ui/common/artwork/oxygen/configure.png b/ui/common/artwork/oxygen/configure.png new file mode 100644 index 0000000..79f92de Binary files /dev/null and b/ui/common/artwork/oxygen/configure.png differ diff --git a/ui/common/artwork/oxygen/drive-harddisk.png b/ui/common/artwork/oxygen/drive-harddisk.png new file mode 100644 index 0000000..68351d1 Binary files /dev/null and b/ui/common/artwork/oxygen/drive-harddisk.png differ diff --git a/ui/common/artwork/oxygen/drive-optical.png b/ui/common/artwork/oxygen/drive-optical.png new file mode 100644 index 0000000..82dd0cd Binary files /dev/null and b/ui/common/artwork/oxygen/drive-optical.png differ diff --git a/ui/common/artwork/oxygen/drive-removable-media-usb-pendrive.png b/ui/common/artwork/oxygen/drive-removable-media-usb-pendrive.png new file mode 100644 index 0000000..568c078 Binary files /dev/null and b/ui/common/artwork/oxygen/drive-removable-media-usb-pendrive.png differ diff --git a/ui/common/artwork/oxygen/media-optical.png b/ui/common/artwork/oxygen/media-optical.png new file mode 100644 index 0000000..c11bf8a Binary files /dev/null and b/ui/common/artwork/oxygen/media-optical.png differ diff --git a/ui/common/artwork/oxygen/network-wired.png b/ui/common/artwork/oxygen/network-wired.png new file mode 100644 index 0000000..2981c5b Binary files /dev/null and b/ui/common/artwork/oxygen/network-wired.png differ diff --git a/ui/common/artwork/oxygen/utilities-terminal.png b/ui/common/artwork/oxygen/utilities-terminal.png new file mode 100644 index 0000000..8e2f3c1 Binary files /dev/null and b/ui/common/artwork/oxygen/utilities-terminal.png differ diff --git a/ui/common/artwork/system.png b/ui/common/artwork/system.png deleted file mode 100644 index 221b8fc..0000000 Binary files a/ui/common/artwork/system.png and /dev/null differ diff --git a/ui/common/artwork/usbpen.png b/ui/common/artwork/usbpen.png deleted file mode 100644 index 53a365e..0000000 Binary files a/ui/common/artwork/usbpen.png and /dev/null differ -- cgit v1.2.1