diff --git a/debian/changelog b/debian/changelog index 1ae38c5..ca4f43c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x11-xserver-utils (7.3+3) UNRELEASED; urgency=low * xrdb 1.0.5 * xset 1.0.4 * xrandr 1.2.3 + * update debian/copyright with information from xrandr's COPYING file. -- Julien Cristau Fri, 07 Mar 2008 20:27:02 +0100 diff --git a/debian/copyright b/debian/copyright index 8dc97f4..60a9d62 100644 --- a/debian/copyright +++ b/debian/copyright @@ -159,24 +159,25 @@ xmodmap: xrandr: Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. Copyright © 2002 Hewlett Packard Company, Inc. + Copyright © 2006 Intel Corporation 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 Keith Packard or HP not be used in - advertising or publicity pertaining to distribution of the software without - specific, written prior permission. Keith Packard and HP makes no - representations about the suitability of this software for any purpose. It - is provided "as is" without express or implied warranty. + 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 the copyright holders not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no representations + about the suitability of this software for any purpose. It is provided "as + is" without express or implied warranty. - KEITH PACKARD and HP DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + EVENT SHALL THE COPYRIGHT HOLDERS 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. + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + OF THIS SOFTWARE. xrdb: COPYRIGHT 1987, 1991