Merging XORG-CURRENT into trunkXACE-SELINUX-MERGECOMPOSITEWRAP

18 files changed, 24 insertions, 24 deletions

diff --git a/man/cirrus.man b/man/cirrus.man
index 5035b02..ef0f43b 100644
--- a/man/cirrus.man
+++ b/man/cirrus.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v 1.1 2001/01/24 00:06:17 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH CIRRUS __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ cirrus \- Cirrus Logic video driver
 .fi
 .SH DESCRIPTION
 .B cirrus 
-is an XFree86 driver for Cirrus Logic video chips.
+is an __xservername__ driver for Cirrus Logic video chips.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B cirrus
 driver supports...
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
diff --git a/src/CirrusClk.c b/src/CirrusClk.c
index c548f1f..e3388df 100644
--- a/src/CirrusClk.c
+++ b/src/CirrusClk.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/CirrusClk.c,v 1.9 1999/12/26 18:24:14 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/CirrusClk.c,v 1.8 1998/12/06 06:08:28 dawes Exp $ */
 
 /*
  * Programming of the built-in Cirrus clock generator.
diff --git a/src/alp.h b/src/alp.h
index 01c5301..2eadc24 100644
--- a/src/alp.h
+++ b/src/alp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp.h,v 1.8 2001/10/01 13:44:05 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp.h,v 1.6 2001/02/15 17:39:28 eich Exp $ */
 
 /* (c) Itai Nahshon */
 
diff --git a/src/alp_driver.c b/src/alp_driver.c
index c4533c0..d20507e 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -11,7 +11,7 @@
  *    Guy DESBIEF
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.36 2003/11/07 22:49:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.35 2003/11/03 05:11:09 tsi Exp $ */
 
 /* All drivers should typically include these */
 #include "xf86.h"
@@ -238,7 +238,7 @@ static XF86ModuleVersionInfo alpVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	ALP_MAJOR_VERSION, ALP_MINOR_VERSION, ALP_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,
diff --git a/src/alp_hwcurs.c b/src/alp_hwcurs.c
index a4f0581..002098f 100644
--- a/src/alp_hwcurs.c
+++ b/src/alp_hwcurs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_hwcurs.c,v 1.5 2001/05/07 21:59:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_hwcurs.c,v 1.4 2000/12/06 15:35:15 eich Exp $ */
 
 /* (c) Itai Nahshon */
 
diff --git a/src/alp_i2c.c b/src/alp_i2c.c
index 78d5406..ba80065 100644
--- a/src/alp_i2c.c
+++ b/src/alp_i2c.c
@@ -1,6 +1,6 @@
 /* (c) Itai Nahshon */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.3 2000/12/06 15:35:15 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.6 1999/02/28 11:19:38 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/alp_xaa.c b/src/alp_xaa.c
index 417f816..bbdf735 100644
--- a/src/alp_xaa.c
+++ b/src/alp_xaa.c
@@ -1,6 +1,6 @@
 /* (c) Itai Nahshon */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.8 2002/01/25 21:56:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/alp_xaam.c b/src/alp_xaam.c
index 2f25092..5b4ab25 100644
--- a/src/alp_xaam.c
+++ b/src/alp_xaam.c
@@ -1,6 +1,6 @@
 /* (c) Itai Nahshon */
 /* #define DEBUG */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.8 2002/07/10 02:36:50 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/cir.h b/src/cir.h
index 536f7aa..2000c68 100644
--- a/src/cir.h
+++ b/src/cir.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.21 2002/01/25 21:56:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.20 2002/01/04 21:26:54 tsi Exp $ */
 
 /* (c) Itai Nahshon */
 
diff --git a/src/cir_dga.c b/src/cir_dga.c
index 7677160..6f31084 100644
--- a/src/cir_dga.c
+++ b/src/cir_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_dga.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_dga.c,v 1.5 2001/02/15 17:39:27 eich Exp $ */
 /*
  * Copyright 2000 by Egbert Eich
  *
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 737eb3f..239ac01 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -11,7 +11,7 @@
  *	Guy DESBIEF
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.69 2003/06/18 16:17:38 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.67 2001/05/15 10:19:37 eich Exp $ */
 
 /* All drivers should typically include these */
 #include "xf86.h"
@@ -143,7 +143,7 @@ static XF86ModuleVersionInfo cirVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	CIR_MAJOR_VERSION, CIR_MINOR_VERSION, CIR_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,
diff --git a/src/cir_shadow.c b/src/cir_shadow.c
index 184dee8..1c529eb 100644
--- a/src/cir_shadow.c
+++ b/src/cir_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_shadow.c,v 1.1 2000/02/08 13:13:14 eich Exp $ */
+/* $XFree86: Exp $ */
 
 /*
    Copyright (c) 1999,2000  The XFree86 Project Inc. 
diff --git a/src/lg.h b/src/lg.h
index 9d91053..09285a4 100644
--- a/src/lg.h
+++ b/src/lg.h
@@ -10,7 +10,7 @@
  *  Inspired by cir.h
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.12 2001/05/04 19:05:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.11 2000/12/06 15:35:16 eich Exp $ */
 
 #ifndef LG_H
 #define LG_H
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 90eee02..da6d208 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -13,7 +13,7 @@
  *	David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
  *	Guy DESBIEF, Itai Nahshon.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.50 2003/11/07 22:49:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.49 2003/11/03 05:11:09 tsi Exp $ */
 
 #define EXPERIMENTAL
 
@@ -246,7 +246,7 @@ static XF86ModuleVersionInfo lgVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	LG_MAJOR_VERSION, LG_MINOR_VERSION, LG_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,
diff --git a/src/lg_hwcurs.c b/src/lg_hwcurs.c
index 7e30bdb..2f3101d 100644
--- a/src/lg_hwcurs.c
+++ b/src/lg_hwcurs.c
@@ -10,7 +10,7 @@
  * Much of this code is inspired by the HW cursor code from XFree86
  * 3.3.3.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.5 2001/05/07 21:59:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/lg_i2c.c b/src/lg_i2c.c
index 6cb3e3d..7f5ee4e 100644
--- a/src/lg_i2c.c
+++ b/src/lg_i2c.c
@@ -1,6 +1,6 @@
 /* (c) Itai Nahshon */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.1 1998/11/15 04:30:25 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/lg_xaa.c b/src/lg_xaa.c
index 9488721..7b84b6b 100644
--- a/src/lg_xaa.c
+++ b/src/lg_xaa.c
@@ -10,7 +10,7 @@
  * Much of this code is inspired by the XAA acceleration from XFree86
  * 3.3.3, laguna_acl.c
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.5 2001/02/15 17:39:28 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/lg_xaa.h b/src/lg_xaa.h
index 7359a49..b115dc8 100644
--- a/src/lg_xaa.h
+++ b/src/lg_xaa.h
@@ -13,7 +13,7 @@
  * This header file draws much from the file cir_blitLG.h in version 3.3.3
  * of XFree86.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.h,v 1.3 2000/02/08 13:13:15 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.h,v 1.1 1998/11/22 10:37:21 dawes Exp $ */
 
 /* This header file defines the necessary structures, contstants, and
    variables for using the bitBLT engine on a Laguna family graphics