summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-16 19:45:06 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-16 19:45:06 -0700
commit5f575d39fd0a246eb1842af8989b6b8fa6eebc36 (patch)
tree48dc6d895e21648827ff0f116af77ba73bccfc6d
parent232bd12671f129df0fbcd84e750cbd7a397612bd (diff)
Add XFree86 generic copyright/license notice to COPYING
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--COPYING30
1 files changed, 22 insertions, 8 deletions
diff --git a/COPYING b/COPYING
index 7f33cbf..df95a48 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,26 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+XFree86 code without an explicit copyright is covered by the following copy-
+right/license:
-Please submit updated COPYING files to the Xorg bugzilla:
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+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 fur-
+nished to do so, subject to the following conditions:
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS 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 CON-
+NECTION 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 deal-
+ings in this Software without prior written authorization from the XFree86
+Project.