[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86 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

[Egbert Eich]

Committed by: eich

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

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


Index: bin-list
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/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	20 Dec 2003 00:28:29 -0000	1.1.4.1
+++ b/bin-list	15 Apr 2004 10:16:42 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-.XFree86_Version
+.X.Org_Version
 bin
 lib/libFS.6.0.dylib
 lib/libFS.6.dylib
@@ -29,7 +29,7 @@
 lib/libXaw.7.0.dylib
 lib/libXaw.7.dylib
 lib/libXaw.dylib
-lib/libXcursor.1.0.dylib
+lib/libXcursor.1.0.2.dylib
 lib/libXcursor.1.dylib
 lib/libXcursor.dylib
 lib/libXext.6.4.dylib
@@ -43,7 +43,7 @@
 lib/libXfontcache.dylib
 lib/libXft.1.1.dylib
 lib/libXft.1.dylib
-lib/libXft.2.1.dylib
+lib/libXft.2.1.2.dylib
 lib/libXft.2.dylib
 lib/libXft.dylib
 lib/libXi.6.0.dylib
@@ -67,7 +67,7 @@
 lib/libXrandr.2.0.dylib
 lib/libXrandr.2.dylib
 lib/libXrandr.dylib
-lib/libXrender.1.2.dylib
+lib/libXrender.1.2.2.dylib
 lib/libXrender.1.dylib
 lib/libXrender.dylib
 lib/libXss.1.0.dylib
@@ -103,7 +103,7 @@
 lib/libexpat.0.4.dylib
 lib/libexpat.0.dylib
 lib/libexpat.dylib
-lib/libfontconfig.1.0.dylib
+lib/libfontconfig.1.0.4.dylib
 lib/libfontconfig.1.dylib
 lib/libfontconfig.dylib
 lib/libfontenc.1.0.dylib

Index: prog-excl
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/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:42 -0000	1.1.4.1
@@ -1,5 +1 @@
-lib/Server
-lib/X11
-lib/lib*.dylib
-lib/modules
 include/X11/bitmaps

Index: prog-list
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/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:42 -0000	1.1.4.1
@@ -1,3 +1,4 @@
-lib
+lib/pkgconfig
+lib/lib*.a
 include
 lib/X11/config