Merge the new release from HEADXACE-SELINUX

3 files changed, 12 insertions, 6 deletions

diff --git a/difs/fonts.c b/difs/fonts.c
index 6665de4..bbe8964 100644
--- a/difs/fonts.c
+++ b/difs/fonts.c
@@ -3,7 +3,7 @@
  * font control
  */
 /*
- 
+
 Copyright 1990, 1991, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -46,8 +46,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/xfs/difs/fonts.c,v 3.13 2001/12/14 20:01:34 dawes Exp $ */
-
+/*#define DEBUG*/
 #include        "FS.h"
 #include        "FSproto.h"
 #include	<stdio.h>
@@ -441,6 +440,9 @@ OpenFont(
 	SendErrToClient(client, FSBadName, (pointer) 0);
 	return FSBadName;
     }
+#ifdef DEBUG
+    fprintf(stderr,"OpenFont: %sn",name);
+#endif
     /*
     ** Check name cache.  If we find a cached version of this font that
     ** is cachable, immediately satisfy the request with it.  If we find
diff --git a/include/servermd.h b/include/servermd.h
index 72c48af..6e5cc8a 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -50,11 +50,15 @@ in this Software without prior written authorization from The Open Group.
 #define _SERVERMD_H_
 
 #ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE 6600
+#define VENDOR_RELEASE 6700
 #endif
 
 #ifndef VENDOR_STRING
-#define VENDOR_STRING "The XFree86 Project (experimental version)"
+# if defined VENDORNAME
+#  define VENDOR_STRING VENDORNAME
+# else
+#  define VENDOR_STRING "X.Org Foundation"
+# endif
 #endif
 
 #ifndef DEFAULT_FS_PORT
diff --git a/xfs.def b/xfs.def
index f9040fd..0187d58 100644
--- a/xfs.def
+++ b/xfs.def
@@ -1,4 +1,4 @@
 NAME XFS NOTWINDOWCOMPAT
-DESCRIPTION "X11R6 XFree86 3.1.1 Font Server EMX 0.9A"
+DESCRIPTION "X11R6 3.1.1 Font Server EMX 0.9A"
 PROTMODE
 EXETYPE OS2