From 51f3d1e140307561f64c47dae1d44f912accb5cf Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 5 Oct 2010 06:44:44 +0000 Subject: Update to the following packages: - glproto-1.4.12 - kbproto-1.0.5 - renderproto-0.11.1 - xclock-1.0.5 - xextproto-7.1.2 - xproto-7.0.18 - xwininfo-1.1.0 --- apps/xclock/COPYING | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-) (limited to 'apps/xclock/COPYING') diff --git a/apps/xclock/COPYING b/apps/xclock/COPYING index af99eee78..11a798a8a 100644 --- a/apps/xclock/COPYING +++ b/apps/xclock/COPYING @@ -44,35 +44,23 @@ SOFTWARE. ------------------------------------------------------------ -Copyright 2004 Sun Microsystems, Inc. -All rights reserved. +Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: +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: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of Sun Microsystems, Inc. nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -This software is provided "AS IS," without a warranty of any kind. - -ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, -INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. -SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR -LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE, -MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES. -IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, -PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, -INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE -THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE -SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +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 +THE AUTHORS OR COPYRIGHT HOLDERS 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. -- cgit v1.2.3