Update debian/copyright from upstream COPYING.

2 files changed, 14 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 516e46d..a65326f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xutils-dev (1:7.5+5) UNRELEASED; urgency=low
 
   * lndir 1.0.2.
   * util-macros 1.10.1.
+  * Update debian/copyright from upstream COPYING.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 16 Oct 2010 22:27:22 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 0cfd573..f662371 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,4 @@
 gccmakedep:
-
   XFree86 code without an explicit copyright is covered by the following copy-
   right/license:
   
@@ -78,31 +77,29 @@ imake:
   XFree86 Project.
 
 lndir:
+  Copyright (c) 1990, 1993, 1994, 1998 The Open Group
 
-  Copyright (c) 1990, 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.
 
-makedpend:
-
+makedepend:
   Copyright (c) 1993, 1994, 1998 The Open Group
   
   Permission to use, copy, modify, distribute, and sell this software and its
@@ -127,7 +124,7 @@ makedpend:
 
 util-macros:
   Copyright 2005 Red Hat, 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
@@ -138,7 +135,7 @@ util-macros:
   Hat makes no representations about the suitability of this software
   for any purpose.  It is provided "as is" without express or implied
   warranty.
-  
+
   RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
   NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -146,22 +143,22 @@ util-macros:
   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.
-  
+
   ----------------------------------------------------------------------------
-  
-  Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
-  
+
+  Copyright (c) 2005, 2006, 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