new X Consortium copyright/permission

1 files changed, 27 insertions, 16 deletions

diff --git a/xc/lib/Xmu/DrawLogo.c b/xc/lib/Xmu/DrawLogo.c
index 284096fe5..d072810c5 100644
--- a/xc/lib/Xmu/DrawLogo.c
+++ b/xc/lib/Xmu/DrawLogo.c
@@ -1,23 +1,34 @@
-/* static char Xrcsid[] = "$XConsortium: DrawLogo.c,v 1.2 90/07/15 16:18:23 rws Exp $"; */
-
-#include <X11/Xlib.h>  
+/* $XConsortium: DrawLogo.c,v 1.3 90/12/01 12:58:02 rws Exp $ */
 
 /*
-Copyright 1988 by the Massachusetts Institute of Technology
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in
-advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is"
-without express or implied warranty.
+
+Copyright (c) 1988  X Consortium
+
+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:
+
+The above copyright notice and this permission notice 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
+X CONSORTIUM 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.
+
+Except as contained in this notice, the name of the X Consortium 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 X Consortium.
+
 */
 
+#include <X11/Xlib.h>  
+
 /*
  *  Draw the "official" X Window System Logo, designed by Danny Chong
  *