summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril Brulebois <kibi@debian.org>2011-01-08 20:43:20 +0100
committerCyril Brulebois <kibi@debian.org>2011-01-08 20:43:20 +0100
commit948eda0ac3b8a06471ace655b65c4e586c3f57e9 (patch)
tree3d7a821633f7c6a6fd9a5b313f83ccd5cea6d545
parentfd621c76f1be1795e5842a15bc4462691c3a8b46 (diff)
downloadxutils-dev-948eda0ac3b8a06471ace655b65c4e586c3f57e9.tar.gz
Update debian/copyright with xorg-cf-files/COPYING.
-rw-r--r--debian/changelog1
-rw-r--r--debian/copyright72
2 files changed, 73 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0d7c57b..f5e5cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xutils-dev (1:7.6+1) UNRELEASED; urgency=low
* xorg-cf-files 1.0.4.
+ * Update debian/copyright with xorg-cf-files/COPYING.
-- Cyril Brulebois <kibi@debian.org> Sat, 08 Jan 2011 20:39:39 +0100
diff --git a/debian/copyright b/debian/copyright
index f662371..09587b2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -166,3 +166,75 @@ util-macros:
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.
+
+xorg-cf-files:
+ Most of these files came from X11R6.6 or XFree86 4.4rc2.
+
+ X11R6.6 files are covered by this notice:
+
+ Copyright (c) 1999,2000,2001 Compaq Computer Corporation
+ Copyright (c) 1999,2000,2001 Hewlett-Packard Company
+ Copyright (c) 1999,2000,2001 IBM Corporation
+ Copyright (c) 1999,2000,2001 Hummingbird Communications Ltd.
+ Copyright (c) 1999,2000,2001 Silicon Graphics, Inc.
+ Copyright (c) 1999,2000,2001 Sun Microsystems, Inc.
+ Copyright (c) 1999,2000,2001 The Open Group
+
+ 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
+ he rights to use, copy, modify, merge, publish, distribute, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, provided that the above 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
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ 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
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.
+
+ X Window System is a trademark of The Open Group.
+
+ ----------------------------------------------------------------
+
+ XFree86 code without an explicit copyright is covered by the following
+ copyright/license:
+
+ Copyright (C) 1994-2003 The XFree86 Project, 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 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 XFREE86 PROJECT 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 XFree86 Project 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
+ XFree86 Project.