summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-12-15 09:35:57 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-12-15 09:35:57 +0000
commit823e551f472cc5b870b78fcf2d01c2e51f5a6be9 (patch)
tree58d92b67345767461616481d2ccdd508afb25199 /legacy/emotion
parent052a06726f6ccdf7087a93e51c440587e2da5998 (diff)
clean up emotion copying to match the rest of core efl thats bsd
licensed. SVN revision: 66243
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/COPYING49
-rw-r--r--legacy/emotion/COPYING-PLAIN33
-rw-r--r--legacy/emotion/Makefile.am2
3 files changed, 22 insertions, 62 deletions
diff --git a/legacy/emotion/COPYING b/legacy/emotion/COPYING
index 9690c3f6f6..aab836272d 100644
--- a/legacy/emotion/COPYING
+++ b/legacy/emotion/COPYING
@@ -1,32 +1,25 @@
1Copyright notice for Emotion:
1 2
2Permission is hereby granted, free of charge, to any person obtaining a copy 3Copyright (C) 2004-2011 Carsten Haitzler and various contributors (see AUTHORS)
3of this software and associated documentation files (the "Software"), to
4deal in the Software without restriction, including without limitation the
5rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
6sell copies of the Software, and to permit persons to whom the Software is
7furnished to do so, subject to the following conditions:
8 4
9The above copyright notice and this permission notice shall be included in 5All rights reserved.
10all copies of the Software and its Copyright notices. In addition publicly
11documented acknowledgment must be given that this software has been used if no
12source code of this software is made available publicly. Making the source
13available publicly means including the source for this software with the
14distribution, or a method to get this software via some reasonable mechanism
15(electronic transfer via a network or media) as well as making an offer to
16supply the source on request. This Copyright notice serves as an offer to
17supply the source on on request as well. Instead of this, supplying
18acknowledgments of use of this software in either Copyright notices, Manuals,
19Publicity and Marketing documents or any documentation provided with any
20product containing this software. This License does not apply to any software
21that links to the libraries provided by this software (statically or
22dynamically), but only to the software provided.
23 6
24Please see the COPYING-PLAIN for a plain-english explanation of this notice 7Redistribution and use in source and binary forms, with or without
25and its intent. 8modification, are permitted provided that the following conditions are met:
26 9
27THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 10 1. Redistributions of source code must retain the above copyright
28IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 11 notice, this list of conditions and the following disclaimer.
29FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 12 2. Redistributions in binary form must reproduce the above copyright
30THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 13 notice, this list of conditions and the following disclaimer in the
31IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 14 documentation and/or other materials provided with the distribution.
32CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 15
16THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
17INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
18FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
19COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
20INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
21LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
22OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
23LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
24NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
25EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/legacy/emotion/COPYING-PLAIN b/legacy/emotion/COPYING-PLAIN
deleted file mode 100644
index 43872ad67a..0000000000
--- a/legacy/emotion/COPYING-PLAIN
+++ /dev/null
@@ -1,33 +0,0 @@
1Plain English Copyright Notice
2
3This file is not intended to be the actual License. The reason this file
4exists is that we here are programmers and engineers. We aren't lawyers. We
5provide licenses that we THINK say the right things, but we have our own
6intentions at heart. This is a plain-english explanation of what those
7intentions are, and if you follow them you will be within the "spirit" of
8the license.
9
10The intent is for us to enjoy writing software that is useful to us (the
11AUTHORS) and allow others to use it freely and also benefit from the work we
12put into making it. We don't want to restrict others using it. They should
13not *HAVE* to make the source code of the applications they write that
14simply link to these libraries (be that statically or dynamically), or for
15them to be limited as to what license they choose to use (be it open, closed
16or anything else). But we would like to know you are using these libraries.
17We simply would like to know that it has been useful to someone. This is why
18we ask for acknowledgement of some sort.
19
20You can do what you want with the source of this software - it doesn't
21matter. We still have it here for ourselves and it is open and free to use
22and download and play with. It can't be taken away. We don't really mind what
23you do with the source to your software. We would simply like to know that
24you are using it - especially if it makes it to a commercial product. If you
25simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
26then make sure you include a paragraph or page in the manual for the product
27with the copyright notice and state that you used this software, we will be
28very happy. If you want to contribute back modifications and fixes you may have
29made we will welcome those too with open arms (generally). If you want help
30with changes needed, ports needed or features to be added, arrangements can
31be easily made with some dialogue.
32
33Carsten Haitzler <raster@rasterman.com>
diff --git a/legacy/emotion/Makefile.am b/legacy/emotion/Makefile.am
index 3131dbb807..2ef6b695c3 100644
--- a/legacy/emotion/Makefile.am
+++ b/legacy/emotion/Makefile.am
@@ -13,7 +13,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess emotion.spec \
13 13
14bin_SCRIPTS = 14bin_SCRIPTS =
15 15
16EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \ 16EXTRA_DIST = README AUTHORS COPYING \
17 emotion.spec emotion.spec.in emotion.pc.in \ 17 emotion.spec emotion.spec.in emotion.pc.in \
18 emotion.pc.in 18 emotion.pc.in
19 19