Refresh debian/copyright accordingly.

debian/changelog

@@ -15,6 +15,7 @@ x11-xserver-utils (7.6~1) UNRELEASED; urgency=low
   * xstdcmap 1.0.2
   * Add an update-copyright target to refresh debian/copyright using
     upstream's COPYING files, thanks to Julien Cristau.
+  * Refresh debian/copyright accordingly.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 12 Nov 2010 18:02:37 +0100
 

debian/copyright

@@ -1,8 +1,9 @@
 The contents of this package were downloaded from
 http://xorg.freedesktop.org/releases/individual/app/
+
 It contains the iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap, xrandr,
-xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap and xvidtune
+xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
-applications.
+applications
 
 iceauth:
   Copyright 1989, 1998  The Open Group
@@ -26,10 +27,7 @@ iceauth:
   Except as contained in this notice, the name of The Open Group shall not be
   used in advertising or otherwise to promote the sale, use or other dealings
   in this Software without prior written authorization from The Open Group.
-   * *
+
-   * Original Author of "xauth" : Jim Fulton, MIT X Consortium
-   * Modified into "iceauth"    : Ralph Mor, X Consortium
-   */
 
 rgb:
   Copyright 1985, 1989, 1998  The Open Group
@@ -56,32 +54,26 @@ rgb:
   other dealings in this Software without prior written authorization
   from The Open Group.
 
-   Copyright 1994, 2008 Sun Microsystems, Inc.  All rights reserved.
+  Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a
-   copy of this software and associated documentation files (the
+  copy of this software and associated documentation files (the "Software"),
-   "Software"), to deal in the Software without restriction, including
+  to deal in the Software without restriction, including without limitation
-   without limitation the rights to use, copy, modify, merge, publish,
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-   distribute, and/or sell copies of the Software, and to permit persons
+  and/or sell copies of the Software, and to permit persons to whom the
-   to whom the Software is furnished to do so, provided that the above
+  Software is furnished to do so, subject to the following conditions:
-   copyright notice(s) and this permission notice appear in all copies of
-   the Software and that both the above copyright notice(s) and this
-   permission notice appear in supporting documentation.
 
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  The above copyright notice and this permission notice (including the next
-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  paragraph) shall be included in all copies or substantial portions of the
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+  Software.
-   OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-   HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
 
-   Except as contained in this notice, the name of a copyright holder
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   shall not be used in advertising or otherwise to promote the sale, use
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   or other dealings in this Software without prior written authorization
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-   of the copyright holder.
+  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.
 
 sessreg:
   Copyright 1990, 1998  The Open Group
@@ -108,6 +100,27 @@ sessreg:
   other dealings in this Software without prior written authorization
   from The Open Group.
 
+  Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+
+  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:
+
+  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.
+
 xcmsdb:
   (c) Copyright 1990 Tektronix Inc.
   	All Rights Reserved
@@ -128,6 +141,31 @@ xcmsdb:
   arising out of or in connection with the use or performance of this
   software.
 
+
+  Copyright 1993, 1998  The Open Group
+
+  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.
+
+  The above copyright notice and this permission notice 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 OPEN GROUP 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.
+
+  Except as contained in this notice, the name of The Open Group shall not
+  be used in advertising or otherwise to promote the sale, use or other
+  dealing in this Software without prior written authorization from the
+  The Open Group.
+
 xgamma:
   Copyright 1999  by The XFree86 Project, Inc.
   All Rights Reserved.
@@ -155,8 +193,6 @@ xgamma:
   other dealings in this Software without prior written authorization
   from The XFree86 Project.
 
-  Written by David Bateman
-
   ------------------------------------------------------------------------------
   Copyright 2005  Red Hat, Inc.
 
@@ -179,7 +215,28 @@ xgamma:
   PERFORMANCE OF THIS SOFTWARE.
 
 xhost:
-  Copyright 1985, 1986, 1987, 1998  The Open Group Copyright 2004 Sun Microsystems, Inc.
+  Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+
+  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:
+
+  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.
+
+  Copyright 1985, 1986, 1987, 1998  The Open Group
 
   All rights reserved.
 
@@ -208,7 +265,31 @@ xhost:
   or other dealings in this Software without prior written authorization
   of the copyright holder.
 
+  X Window System is a trademark of The Open Group.
+
+
 xmodmap:
+  Copyright (c) 1987, 2010, Oracle and/or its affiliates. All rights reserved.
+
+  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:
+
+  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.
+
   Copyright 1988, 1998  The Open Group
 
   Permission to use, copy, modify, distribute, and sell this software and its
@@ -257,6 +338,7 @@ xrandr:
   OF THIS SOFTWARE.
 
 xrdb:
+
                          COPYRIGHT 1987, 1991
                   DIGITAL EQUIPMENT CORPORATION
                       MAYNARD, MASSACHUSETTS
@@ -273,7 +355,6 @@ xrdb:
   APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN ADDITION TO THAT
   SET FORTH ABOVE.
 
-  
   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 notice appear in all copies and that both that
@@ -282,6 +363,33 @@ xrdb:
   used in advertising or publicity pertaining to distribution of the software
   without specific, written prior permission.
 
+      ----------------------------------------------------------------
+
+  Copyright 1991, Digital Equipment Corporation.
+  Copyright 1991, 1994, 1998  The Open Group
+
+  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.
+
+  The above copyright notice and this permission notice 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 OPEN GROUP 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.
+
+  Except as contained in this notice, the name of The Open Group shall
+  not be used in advertising or otherwise to promote the sale, use or
+  other dealings in this Software without prior written authorization
+  from The Open Group.
+
 xrefresh:
   Copyright 1987, 1988, 1998  The Open Group
 
@@ -327,7 +435,7 @@ xrefresh:
   SOFTWARE.
 
 xset:
-  Copyright 1985, 1998  The Open Group
+  Copyright 1985, 1988, 1998  The Open Group
 
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
@@ -392,7 +500,7 @@ xsetpointer:
   PERFORMANCE OF THIS SOFTWARE.
 
 xsetroot:
-  Copyright 1987, 1998  The Open Group
+  Copyright 1987, 1988, 1998  The Open Group
 
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
@@ -413,12 +521,9 @@ xsetroot:
   Except as contained in this notice, the name of The Open Group shall not be
   used in advertising or otherwise to promote the sale, use or other dealings
   in this Software without prior written authorization from The Open Group.
-   */
-   *  Author:	Mark Lillibridge, MIT Project Athena
-   *		11-Jun-87
 
 xstdcmap:
-  Copyright 1989, 1998  The Open Group
+  Copyright 1989, 1994, 1998  The Open Group
 
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
@@ -439,8 +544,6 @@ xstdcmap:
   Except as contained in this notice, the name of The Open Group shall not be
   used in advertising or otherwise to promote the sale, use or other dealings
   in this Software without prior written authorization from The Open Group.
-   * *
-   * Author:  Donna Converse, MIT X Consortium
 
 xvidtune:
   Copyright (c) 1995  Kaleb S. KEITHLEY