xcursor: Change keithp licensed code from X11 to Expat license

The license text for this file mentions Keith Packard specifically,
however it is otherwise identical to all the other MIT X11 licensed code
in Wayland, and so can be changed to the substantially identical MIT
Expat license.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Bryce Harrington 2015-06-10 11:36:21 -07:00
parent c78a0a62c6
commit 1faeb7ff48
2 changed files with 38 additions and 32 deletions

View file

@ -1,23 +1,26 @@
/* /*
* Copyright © 2002 Keith Packard * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission is hereby granted, free of charge, to any person obtaining
* documentation for any purpose is hereby granted without fee, provided that * a copy of this software and associated documentation files (the
* the above copyright notice appear in all copies and that both that * "Software"), to deal in the Software without restriction, including
* copyright notice and this permission notice appear in supporting * without limitation the rights to use, copy, modify, merge, publish,
* documentation, and that the name of Keith Packard not be used in * distribute, sublicense, and/or sell copies of the Software, and to
* advertising or publicity pertaining to distribution of the software without * permit persons to whom the Software is furnished to do so, subject to
* specific, written prior permission. Keith Packard makes no * the following conditions:
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
* *
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * The above copyright notice and this permission notice (including the
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO * next paragraph) shall be included in all copies or substantial
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR * portions of the 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,
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* PERFORMANCE OF THIS SOFTWARE. * MERCHANTABILITY, 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.
*/ */
#include "xcursor.h" #include "xcursor.h"

View file

@ -1,23 +1,26 @@
/* /*
* Copyright © 2002 Keith Packard * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission is hereby granted, free of charge, to any person obtaining
* documentation for any purpose is hereby granted without fee, provided that * a copy of this software and associated documentation files (the
* the above copyright notice appear in all copies and that both that * "Software"), to deal in the Software without restriction, including
* copyright notice and this permission notice appear in supporting * without limitation the rights to use, copy, modify, merge, publish,
* documentation, and that the name of Keith Packard not be used in * distribute, sublicense, and/or sell copies of the Software, and to
* advertising or publicity pertaining to distribution of the software without * permit persons to whom the Software is furnished to do so, subject to
* specific, written prior permission. Keith Packard makes no * the following conditions:
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
* *
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * The above copyright notice and this permission notice (including the
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO * next paragraph) shall be included in all copies or substantial
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR * portions of the 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,
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* PERFORMANCE OF THIS SOFTWARE. * MERCHANTABILITY, 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.
*/ */
#ifndef XCURSOR_H #ifndef XCURSOR_H