[PATCH 10/11] cursor-data.h: Change SuSE licensed code from X11 to Expat

[Pekka Paalanen]

On Wed, 10 Jun 2015 11:55:21 -0700
Bryce Harrington <bryce at osg.samsung.com> wrote:

> The license text for this file mentions SuSE 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 at osg.samsung.com>
> ---
>  cursor/cursor-data.h | 34 +++++++++++++++++++---------------
>  1 file changed, 19 insertions(+), 15 deletions(-)
> 
> diff --git a/cursor/cursor-data.h b/cursor/cursor-data.h
> index b1026d7..0d03cd5 100644
> --- a/cursor/cursor-data.h
> +++ b/cursor/cursor-data.h
> @@ -1,22 +1,26 @@
>  /*
>  * Copyright 1999 SuSE, Inc.
>  *
> -* Permission to use, copy, modify, distribute, and sell this software and its
> -* documentation for any purpose is hereby granted without fee, provided that
> -* the above copyright notice appear in all copies and that both that
> -* copyright notice and this permission notice appear in supporting
> -* documentation, and that the name of SuSE not be used in advertising or
> -* publicity pertaining to distribution of the software without specific,
> -* written prior permission.  SuSE makes no representations about the
> -* suitability of this software for any purpose.  It is provided "as is"
> -* without express or implied warranty.
> +* Permission is hereby granted, free of charge, to any person obtaining
> +* a copy of this software and associated documentation files (the
> +* "Software"), to deal in the Software without restriction, including
> +* without limitation the rights to use, copy, modify, merge, publish,
> +* distribute, sublicense, and/or sell copies of the Software, and to
> +* permit persons to whom the Software is furnished to do so, subject to
> +* the following conditions:
>  *
> -* SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
> -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
> -* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> -* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
> -* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
> -* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> +* The above copyright notice and this permission notice (including the
> +* next paragraph) shall be included in all copies or substantial
> +* portions of the Software.
> +*
> +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +* 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.
>  *
>  * Author:  Keith Packard, SuSE, Inc.
>  */

Hi,

I don't think we should change this one at all. As you see from the
copyright, this code was copied from elsewhere. It was definitely not
written under the assumption that "Wayland is MIT licensed" which we
use as the reason to be able to change the license text without
re-licensing.

cursor-data.h was renamed from cursor_data.c in
0371668dcca5aa29c0fc4b59b974e40bcf073563 and the original commit is

commit 9ce9336c5704510a3f5a57ef377870764217f2ec
Author: Philipp Brüschweiler <blei42 at gmail.com>
Date:   Thu Sep 6 18:54:01 2012 +0200

    cursor: Add a default cursor theme
    
    This theme is loaded when the specified cursor theme can not be found.
    
    These cursors are extracted from the xorg sources and transformed into
    raw ARGB data by a small helper program (commited separately).


Thanks,
pq