[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris bin-excl, 1.1, 1.1.4.1 bin-list, 1.1.4.1, 1.1.4.2 prog-excl, 1.1, 1.1.4.1 prog-list, 1.1, 1.1.4.1 xserv-list, 1.1, 1.1.4.1

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris

Modified Files:
      Tag: XORG-CURRENT
	bin-excl bin-list prog-excl prog-list xserv-list 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: bin-excl
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/bin-excl,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/bin-excl	14 Nov 2003 16:48:55 -0000	1.1
+++ b/bin-excl	15 Apr 2004 10:16:49 -0000	1.1.4.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/Solaris/bin-list,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/bin-list	26 Nov 2003 22:49:01 -0000	1.1.4.1
+++ b/bin-list	15 Apr 2004 10:16:49 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-.XFree86_Version
+.X.Org_Version
 bin
 lib/libFS.so.6.0
 lib/libFS.so
@@ -21,7 +21,7 @@
 lib/libXaw.so.6.1
 lib/libXaw.so.7.0
 lib/libXaw.so
-lib/libXcursor.so.1.0
+lib/libXcursor.so.1.0.2
 lib/libXcursor.so
 lib/libXdmGreet.so.2.0
 lib/libXdmGreet.so
@@ -32,7 +32,7 @@
 lib/libXfontcache.so.1.2
 lib/libXfontcache.so
 lib/libXft.so.1.1
-lib/libXft.so.2.1
+lib/libXft.so.2.1.2
 lib/libXft.so
 lib/libXi.so.6.0
 lib/libXi.so
@@ -48,7 +48,7 @@
 lib/libXpm.so
 lib/libXrandr.so.2.0
 lib/libXrandr.so
-lib/libXrender.so.1.2
+lib/libXrender.so.1.2.2
 lib/libXrender.so
 lib/libXss.so.1.0
 lib/libXss.so
@@ -72,7 +72,7 @@
 lib/libdpstk.so
 lib/libexpat.so.0.4
 lib/libexpat.so
-lib/libfontconfig.so.1.0
+lib/libfontconfig.so.1.0.4
 lib/libfontconfig.so
 lib/libfontenc.so.1.0
 lib/libfontenc.so

Index: prog-excl
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/prog-excl,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/prog-excl	14 Nov 2003 16:48:55 -0000	1.1
+++ b/prog-excl	15 Apr 2004 10:16:49 -0000	1.1.4.1
@@ -1,5 +1 @@
-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/Solaris/prog-list,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/prog-list	14 Nov 2003 16:48:55 -0000	1.1
+++ b/prog-list	15 Apr 2004 10:16:49 -0000	1.1.4.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/Solaris/xserv-list,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/xserv-list	14 Nov 2003 16:48:55 -0000	1.1
+++ b/xserv-list	15 Apr 2004 10:16:49 -0000	1.1.4.1
@@ -1,2 +1,2 @@
-bin/XFree86
+bin/Xorg
 bin/X