568. Fix "The Open Group" copyright notices to reflect the change in

      post R6.4 licensing (#5093, Mark Snitily, from X11R6.6).

5 files changed, 35 insertions, 15 deletions

diff --git a/programs/fstobdf/chars.c b/programs/fstobdf/chars.c
index 3bb8cf6b9..5e91f2bee 100644
--- a/programs/fstobdf/chars.c
+++ b/programs/fstobdf/chars.c
@@ -1,9 +1,13 @@
-/* $Xorg: chars.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ */
+/* $Xorg: chars.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
 /*
  
 Copyright 1990, 1998  The Open Group
 
-All Rights Reserved.
+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.
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
@@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/fstobdf/chars.c,v 3.6 2001/01/17 23:44:54 dawes Exp $ */
+/* $XFree86: xc/programs/fstobdf/chars.c,v 3.7 2001/03/04 00:16:31 tsi Exp $ */
 
 /* Morten Storgaard Nielsen: chars.c,v 3.2-1 2000/01/30 14:11:19 kat Exp */
 
diff --git a/programs/fstobdf/fstobdf.c b/programs/fstobdf/fstobdf.c
index 2f9dedf16..9ce2cea89 100644
--- a/programs/fstobdf/fstobdf.c
+++ b/programs/fstobdf/fstobdf.c
@@ -1,9 +1,13 @@
-/* $Xorg: fstobdf.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ */
+/* $Xorg: fstobdf.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
 /*
  
 Copyright 1990, 1998  The Open Group
 
-All Rights Reserved.
+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.
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
@@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/fstobdf/fstobdf.c,v 1.4 2001/01/17 23:44:54 dawes Exp $ */
+/* $XFree86: xc/programs/fstobdf/fstobdf.c,v 1.5 2001/04/01 14:00:18 tsi Exp $ */
 
 #include	<stdio.h>
 #include	<stdlib.h>
diff --git a/programs/fstobdf/fstobdf.man b/programs/fstobdf/fstobdf.man
index d24bd8e4b..f76b009b9 100644
--- a/programs/fstobdf/fstobdf.man
+++ b/programs/fstobdf/fstobdf.man
@@ -1,8 +1,12 @@
-.\" $Xorg: fstobdf.man,v 1.3 2000/08/17 19:53:53 cpqbld Exp $
+.\" $Xorg: fstobdf.man,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $
 .\" Copyright 1990, Network Computing Devices
 .\" Copyright 1990, 1998  The Open Group
 .\" 
-.\" All Rights Reserved.
+.\" 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.
 .\" 
 .\" The above copyright notice and this permission notice shall be included
 .\" in all copies or substantial portions of the Software.
@@ -20,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86$
+.\" $XFree86: xc/programs/fstobdf/fstobdf.man,v 1.6 2001/01/27 18:21:02 dawes Exp $
 .\"
 .TH FSTOBDF 1 __xorgversion__
 .SH NAME
diff --git a/programs/fstobdf/header.c b/programs/fstobdf/header.c
index 6f0a2214c..7350b85cd 100644
--- a/programs/fstobdf/header.c
+++ b/programs/fstobdf/header.c
@@ -1,9 +1,13 @@
-/* $Xorg: header.c,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ */
+/* $Xorg: header.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
 /*
  
 Copyright 1990, 1998  The Open Group
 
-All Rights Reserved.
+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.
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
@@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/fstobdf/header.c,v 3.5 2001/01/17 23:44:54 dawes Exp $ */
+/* $XFree86: xc/programs/fstobdf/header.c,v 3.6 2001/07/25 15:05:13 dawes Exp $ */
 
 #include	<stdio.h>
 #include	<X11/Xosdefs.h>
diff --git a/programs/fstobdf/props.c b/programs/fstobdf/props.c
index 665d7e5b0..29e32498f 100644
--- a/programs/fstobdf/props.c
+++ b/programs/fstobdf/props.c
@@ -1,9 +1,13 @@
-/* $Xorg: props.c,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ */
+/* $Xorg: props.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
 /*
  
 Copyright 1990, 1991, 1998  The Open Group
 
-All Rights Reserved.
+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.
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
@@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/fstobdf/props.c,v 1.4 1999/02/25 06:01:01 dawes Exp $ */
+/* $XFree86: xc/programs/fstobdf/props.c,v 1.5 2001/01/17 23:44:54 dawes Exp $ */
 
 #include	<stdio.h>
 #include	<string.h>