From 3f3532422225e23114427ad6f1fbc039e60b64c9 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 15 Jan 2010 13:05:38 -0800 Subject: Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith --- COPYING | 46 +++++++++++++++++----------------------------- Clock.c | 48 +++++++++++++++++++----------------------------- 2 files changed, 36 insertions(+), 58 deletions(-) diff --git a/COPYING b/COPYING index af99eee..2b0dbed 100644 --- a/COPYING +++ b/COPYING @@ -44,35 +44,23 @@ SOFTWARE. ------------------------------------------------------------ -Copyright 2004 Sun Microsystems, Inc. -All rights reserved. +Copyright © 2004 Sun Microsystems, Inc. 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. diff --git a/Clock.c b/Clock.c index cbb0e42..e8b0449 100644 --- a/Clock.c +++ b/Clock.c @@ -48,38 +48,28 @@ SOFTWARE. ******************************************************************/ /* - * Copyright 2004 Sun Microsystems, Inc. - * All rights reserved. + * Copyright © 2004 Sun Microsystems, Inc. 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. + */ +/* * Authors: I18N - Steve Swales - March 2000 * bgpixmap - Alan Coopersmith (as part of STSF project) - Sept. 2001 */ -- cgit v1.2.3