COPYING: Update to MIT Expat License rather than MIT X License
MIT has released software under several slightly different licenses, including the old 'X11 License' or 'MIT License'. Some code under this license was in fact included in X.org's Xserver in the past. However, X.org now prefers the MIT Expat License as the standard (which, confusingly, is also referred to as the 'MIT License'). See http://cgit.freedesktop.org/xorg/xserver/tree/COPYING When Wayland started, it was Kristian Høgsberg's intent to license it compatibly with X.org. "I wanted Wayland to be usable (license-wise) whereever X was usable." But, the text of the older X11 License was taken for Wayland, rather than X11's current standard. This patch corrects this by swapping in the intended text. In practical terms, the most notable change is the dropping of the no-advertising clause. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
parent
56a5a890b5
commit
c4bad43425
39
COPYING
39
COPYING
|
@ -3,20 +3,27 @@ Copyright © 2010-2012 Intel Corporation
|
||||||
Copyright © 2011 Benjamin Franzke
|
Copyright © 2011 Benjamin Franzke
|
||||||
Copyright © 2012 Collabora, Ltd.
|
Copyright © 2012 Collabora, Ltd.
|
||||||
|
|
||||||
Permission to use, copy, modify, distribute, and sell this software and its
|
Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
documentation for any purpose is hereby granted without fee, provided that
|
copy of this software and associated documentation files (the "Software"),
|
||||||
the above copyright notice appear in all copies and that both that copyright
|
to deal in the Software without restriction, including without limitation
|
||||||
notice and this permission notice appear in supporting documentation, and
|
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
that the name of the copyright holders not be used in advertising or
|
and/or sell copies of the Software, and to permit persons to whom the
|
||||||
publicity pertaining to distribution of the software without specific,
|
Software is furnished to do so, subject to the following conditions:
|
||||||
written prior permission. The copyright holders make no representations
|
|
||||||
about the suitability of this software for any purpose. It is provided "as
|
|
||||||
is" without express or implied warranty.
|
|
||||||
|
|
||||||
THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
The above copyright notice and this permission notice (including the next
|
||||||
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
paragraph) shall be included in all copies or substantial portions of the
|
||||||
EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
Software.
|
||||||
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
||||||
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
OF THIS SOFTWARE.
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
|
DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
The above is the version of the MIT "Expat" License used by X.org:
|
||||||
|
|
||||||
|
http://cgit.freedesktop.org/xorg/xserver/tree/COPYING
|
||||||
|
|
Loading…
Reference in New Issue
Block a user