summaryrefslogtreecommitdiff
path: root/app/xdpyinfo/COPYING
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-10-31 19:09:33 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-10-31 19:09:33 +0000
commitefd2cc488411f0777ab0ff502a7bfcfa653fb800 (patch)
treeac494983010b5ff48fd4a8776546f9bf5ead2306 /app/xdpyinfo/COPYING
parent41f6960242df27158c30d201ebeb88c543315755 (diff)
Update to xdpyinfo 1.2.0
Diffstat (limited to 'app/xdpyinfo/COPYING')
-rw-r--r--app/xdpyinfo/COPYING26
1 files changed, 18 insertions, 8 deletions
diff --git a/app/xdpyinfo/COPYING b/app/xdpyinfo/COPYING
index 7f33cbfd2..c598f4240 100644
--- a/app/xdpyinfo/COPYING
+++ b/app/xdpyinfo/COPYING
@@ -1,12 +1,22 @@
-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.
+Copyright 1988, 1998 The Open Group
+Copyright 2005 Hitachi, Ltd.
-Please submit updated COPYING files to the Xorg bugzilla:
+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.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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.