From 3017671740360cc4437fef977c13af0e1c2c8fe8 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Wed, 4 Jul 2012 17:30:04 +0100 Subject: [PATCH] As 'copyright' is used by dthello, make sure that it's based on the current LGPL license, and move previous copyright file to copyright.old --- cde/copyright | 33 ++++----------------------------- cde/copyright.old | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 cde/copyright.old diff --git a/cde/copyright b/cde/copyright index 50ba9e67..0bed7c2a 100644 --- a/cde/copyright +++ b/cde/copyright @@ -1,36 +1,11 @@ -Below is a copy of the original copyright notice that accompanied the -commercial releases of the Common Desktop Environment. For rights and -information that covers the open-source releases, please see the file -COPYING. -If you wish to license the Common Desktop Environment under other terms -please contact The Open Group. ------------------------------------------------------------------------------ Common Desktop Environment Version 2.1.30 - (c) Copyright 1993 - 1999 Hewlett-Packard Company - (c) Copyright 1993 - 1999 International Business Machines Corp. - (c) Copyright 1993 - 1999 Sun Microsystems, Inc. - (c) Copyright 1993 - 1999 Santa Cruz Organization, Inc. - (c) Copyright 1995 - 1999 Digital Equipment Corp. - (c) Copyright 1995 - 1996 Fujitsu Limited - (c) Copyright 1995 - 1996 Hitachi, Ltd. + (c) Copyright 1993-2012 The Open Group +Project Website: http://www.sourceforge.net/projects/cdesktopenv/ - RESTRICTED RIGHTS LEGEND - -Use, duplication, or disclosure by the U.S. Government is subject to -restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in -Technical Data and Computer Software clause in DFARS 252.227-7013. Rights -for non-DOD U.S. Government Departments and Agencies are as set forth in -FAR 52.227-19(c)(1,2). - -Hewlett-Packard Company, 3000 Hanover Street, Palo Alto, CA 94304 U.S.A. -International Business Machines Corp., Route 100, Somers, NY 10589 U.S.A. -Sun Microsystems, Inc., 2550 Garcia Avenue, Mountain View, CA 94043 U.S.A. -Santa Cruz Organization, Inc., 425 Encinal Street, Santa Cruz, CA 95061 U.S.A. -Digital Equipment Corp., 111 Powdermill Road, Maynard, MA 01754, U.S.A. -Fujitsu Limited, 1015, Kamikodanaka Nakahara-Ku, Kawasaki 211, Japan -Hitachi, Ltd., 6, Kanda Surugadai 4-Chome, Chiyoda-ku, Tokyo 101, Japan +CDE, the Common Desktop Environment, is released under the terms of +the GNU LGPL, please see the file COPYING for more details. diff --git a/cde/copyright.old b/cde/copyright.old new file mode 100644 index 00000000..50ba9e67 --- /dev/null +++ b/cde/copyright.old @@ -0,0 +1,36 @@ +Below is a copy of the original copyright notice that accompanied the +commercial releases of the Common Desktop Environment. For rights and +information that covers the open-source releases, please see the file +COPYING. + +If you wish to license the Common Desktop Environment under other terms +please contact The Open Group. +----------------------------------------------------------------------------- + + + Common Desktop Environment Version 2.1.30 + + (c) Copyright 1993 - 1999 Hewlett-Packard Company + (c) Copyright 1993 - 1999 International Business Machines Corp. + (c) Copyright 1993 - 1999 Sun Microsystems, Inc. + (c) Copyright 1993 - 1999 Santa Cruz Organization, Inc. + (c) Copyright 1995 - 1999 Digital Equipment Corp. + (c) Copyright 1995 - 1996 Fujitsu Limited + (c) Copyright 1995 - 1996 Hitachi, Ltd. + + + RESTRICTED RIGHTS LEGEND + +Use, duplication, or disclosure by the U.S. Government is subject to +restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in +Technical Data and Computer Software clause in DFARS 252.227-7013. Rights +for non-DOD U.S. Government Departments and Agencies are as set forth in +FAR 52.227-19(c)(1,2). + +Hewlett-Packard Company, 3000 Hanover Street, Palo Alto, CA 94304 U.S.A. +International Business Machines Corp., Route 100, Somers, NY 10589 U.S.A. +Sun Microsystems, Inc., 2550 Garcia Avenue, Mountain View, CA 94043 U.S.A. +Santa Cruz Organization, Inc., 425 Encinal Street, Santa Cruz, CA 95061 U.S.A. +Digital Equipment Corp., 111 Powdermill Road, Maynard, MA 01754, U.S.A. +Fujitsu Limited, 1015, Kamikodanaka Nakahara-Ku, Kawasaki 211, Japan +Hitachi, Ltd., 6, Kanda Surugadai 4-Chome, Chiyoda-ku, Tokyo 101, Japan -- 2.25.1