[PATCH] Update Sun license notices to current X.Org standard form

[Peter Hutterer]

On Tue, Dec 15, 2009 at 03:58:26PM -0800, Alan Coopersmith wrote:
> Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
> ---
>  COPYING                                            |   28 +----------
>  composite/compalloc.c                              |   36 ++++++--------
>  composite/compext.c                                |   36 ++++++--------
>  composite/compinit.c                               |   36 ++++++--------
>  composite/compint.h                                |   36 ++++++--------
>  composite/compoverlay.c                            |   36 ++++++--------
>  composite/compwindow.c                             |   36 ++++++--------
>  dix/Xserver-dtrace.h.in                            |   36 ++++++--------
>  dix/Xserver.d                                      |   40 ++++++--------
>  dix/dispatch.c                                     |   40 ++++++--------
>  dix/events.c                                       |   54 ++++++++------------
>  dix/resource.c                                     |   40 ++++++--------
>  fb/fbcmap.c                                        |   51 ++++++++-----------
>  fb/fbcmap_mi.c                                     |   51 ++++++++-----------
>  hw/xfree86/os-support/solaris/solaris-amd64.S      |   40 ++++++--------
>  hw/xfree86/os-support/solaris/solaris-ia32.S       |   40 ++++++--------
>  .../os-support/solaris/solaris-sparcv8plus.S       |   40 ++++++--------
>  hw/xfree86/os-support/solaris/sun_VTsw.c           |   36 ++++++--------
>  hw/xfree86/os-support/solaris/sun_agp.c            |   36 ++++++--------
>  hw/xfree86/os-support/solaris/sun_apm.c            |   36 ++++++--------
>  hw/xfree86/os-support/solaris/sun_bell.c           |   40 ++++++--------
>  hw/xfree86/os-support/solaris/sun_vid.c            |   36 ++++++--------
>  hw/xfree86/utils/cvt/Makefile.am                   |   42 +++++++---------
>  hw/xfree86/utils/gtf/Makefile.am                   |   42 +++++++---------
>  mi/micmap.c                                        |   50 ++++++++----------
>  os/access.c                                        |   24 ++++++++-
>  xfixes/cursor.c                                    |   36 ++++++--------
>  xfixes/xfixes.c                                    |   36 ++++++--------
>  xfixes/xfixesint.h                                 |   36 ++++++--------
>  29 files changed, 477 insertions(+), 649 deletions(-)
> 
> diff --git a/COPYING b/COPYING
> index ef52fb6..3fb06b8 100644
> --- a/COPYING
> +++ b/COPYING
> @@ -19,6 +19,7 @@ Copyright © 1999 Keith Packard
>  Copyright © 2007-2009 Red Hat, Inc.
>  Copyright © 2005-2008 Daniel Stone
>  Copyright © 2006-2009 Simon Thum
> +Copyright © 1987, 2003-2006, 2008-2009 Sun Microsystems, Inc.

2007 must have been a slow year :)

>  Copyright © 2006 Luc Verhaegen
>  
>  Permission is hereby granted, free of charge, to any person obtaining a
> @@ -164,32 +165,6 @@ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
>  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>  
>  
> -Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
> -All Rights Reserved
> -
> -Permission  to  use,  copy,  modify,  and  distribute   this
> -software  and  its documentation for any purpose and without
> -fee is hereby granted, provided that the above copyright no-
> -tice  appear  in all copies and that both that copyright no-
> -tice and this permission notice appear in  supporting  docu-
> -mentation,  and  that the names of Sun or X Consortium
> -not be used in advertising or publicity pertaining to
> -distribution  of  the software  without specific prior
> -written permission. Sun and X Consortium make no
> -representations about the suitability of this software for
> -any purpose. It is provided "as is" without any express or
> -implied warranty.

I guess removing the X Consortium is ok here, since it's not actually
part of the copyright assignhment. This class of license blurbs was the only
one that stood out.

> -
> -SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO  THIS  SOFTWARE,
> -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
> -NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE  LI-
> -ABLE  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.
> -
[...]

Acked-by: Peter Hutterer <peter.hutterer at who-t.net>

just checked if any other copyright holders got accidentally lost, not the
actual legal mumbo-jumbo.
 
Cheers,
  Peter