[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout bin-excl, 1.1, 1.1.6.1 bin-list, 1.1.4.1, 1.1.4.1.2.1 prog-excl, 1.1, 1.1.6.1 prog-list, 1.1, 1.1.6.1 xserv-list, 1.1, 1.1.6.1

[Alexander Gottwald]

Committed by: ago

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout
In directory pdx:/home/ago/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout

Modified Files:
      Tag: CYGWIN
	bin-excl bin-list prog-excl prog-list xserv-list 
Log Message:
Merge with XORG-RELEASE-1-TM (48+closed)

Index: bin-excl
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/bin-excl,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- a/bin-excl	14 Nov 2003 16:48:55 -0000	1.1
+++ b/bin-excl	2 Apr 2004 19:46:24 -0000	1.1.6.1
@@ -1,4 +1,4 @@
-bin/XF86_*
+bin/Xorg_*
 bin/XF98_*
 bin/XF86Setup
 bin/Xnest
@@ -7,4 +7,4 @@
 bin/X
 bin/xfs
 bin/xmseconfig
-bin/XFree86
+bin/Xorg

Index: bin-list
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/bin-list,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.2.1
diff -u -d -r1.1.4.1 -r1.1.4.1.2.1
--- a/bin-list	26 Nov 2003 22:49:01 -0000	1.1.4.1
+++ b/bin-list	2 Apr 2004 19:46:24 -0000	1.1.4.1.2.1
@@ -1,4 +1,4 @@
-.XFree86_Version
+.X.Org_Version
 bin
 lib/libFS.so.6.0
 lib/libGL.so.1.2
@@ -12,12 +12,12 @@
 lib/libXTrap.so.6.4
 lib/libXaw.so.6.1
 lib/libXaw.so.7.0
-lib/libXcursor.so.1.0
+lib/libXcursor.so.1.0.2
 lib/libXext.so.6.4
 lib/libXfont.so.1.5
 lib/libXfontcache.so.1.2
 lib/libXft.so.1.1
-lib/libXft.so.2.1
+lib/libXft.so.2.1.1
 lib/libXi.so.6.0
 lib/libXinerama.so.1.0
 lib/libXmu.so.6.2
@@ -25,7 +25,7 @@
 lib/libXp.so.6.2
 lib/libXpm.so.4.11
 lib/libXrandr.so.2.0
-lib/libXrender.so.1.2
+lib/libXrender.so.1.2.2
 lib/libXss.so.1.0
 lib/libXt.so.6.0
 lib/libXtst.so.6.1
@@ -37,7 +37,7 @@
 lib/libdps.so.1.0
 lib/libdpstk.so.1.0
 lib/libexpat.so.4.0
-lib/libfontconfig.so.1.0
+lib/libfontconfig.so.1.0.4
 lib/libfontenc.so.1.0
 lib/libfreetype.so.9.0
 lib/liboldX.so.6.0

Index: prog-excl
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/prog-excl,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- a/prog-excl	14 Nov 2003 16:48:55 -0000	1.1
+++ b/prog-excl	2 Apr 2004 19:46:24 -0000	1.1.6.1
@@ -1,5 +1,2 @@
-lib/Server
-lib/X11
-lib/lib*.so*
 lib/modules
 include/X11/bitmaps

Index: prog-list
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/prog-list,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- a/prog-list	14 Nov 2003 16:48:55 -0000	1.1
+++ b/prog-list	2 Apr 2004 19:46:24 -0000	1.1.6.1
@@ -1,3 +1,4 @@
-lib
+lib/pkgconfig
+lib/lib*.a
 include
 lib/X11/config

Index: xserv-list
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/xserv-list,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- a/xserv-list	14 Nov 2003 16:48:55 -0000	1.1
+++ b/xserv-list	2 Apr 2004 19:46:24 -0000	1.1.6.1
@@ -1,2 +1,2 @@
-bin/XFree86
+bin/Xorg
 bin/X