rpms/xorg-x11-server/devel .cvsignore, 1.48, 1.49 import.log, 1.2, 1.3 sources, 1.43, 1.44 xorg-x11-server.spec, 1.364, 1.365 xserver-1.5.0-comment-out-glxdri2.c, 1.1, NONE xserver-1.5.0-xkb-core-kbd-map-fix.patch, 1.1, NONE xserver-1.5.1-int10-leaks.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18025/devel

Modified Files:
	.cvsignore import.log sources xorg-x11-server.spec 
Removed Files:
	xserver-1.5.0-comment-out-glxdri2.c 
	xserver-1.5.0-xkb-core-kbd-map-fix.patch 
	xserver-1.5.1-int10-leaks.patch 
Log Message:
xserver 1.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	23 Sep 2008 19:36:20 -0000	1.48
+++ .cvsignore	10 Oct 2008 19:30:43 -0000	1.49
@@ -1 +1 @@
-xorg-server-1.5.1.tar.bz2
+xorg-server-1.5.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Sep 2008 19:36:20 -0000	1.2
+++ import.log	10 Oct 2008 19:30:43 -0000	1.3
@@ -1,2 +1,3 @@
 xorg-x11-server-1_5_0-1_fc10:HEAD:xorg-x11-server-1.5.0-1.fc10.src.rpm:1220485219
 xorg-x11-server-1_5_1-1_fc10:HEAD:xorg-x11-server-1.5.1-1.fc10.src.rpm:1222198557
+xorg-x11-server-1_5_2-1_fc10:HEAD:xorg-x11-server-1.5.2-1.fc10.src.rpm:1223667007


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	23 Sep 2008 19:36:20 -0000	1.43
+++ sources	10 Oct 2008 19:30:43 -0000	1.44
@@ -1 +1 @@
-d16f5a033f001c9069b4141194614da2  xorg-server-1.5.1.tar.bz2
+376a1c790f7519f3ab3e047409c659f0  xorg-server-1.5.2.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- xorg-x11-server.spec	10 Oct 2008 18:21:05 -0000	1.364
+++ xorg-x11-server.spec	10 Oct 2008 19:30:43 -0000	1.365
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.5.1
-Release:   11%{?dist}
+Version:   1.5.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -59,7 +59,6 @@
 
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 Patch2014:  xserver-1.5.0-projector-fb-size.patch
-Patch2015:  xserver-1.5.0-comment-out-glxdri2.c
 
 # Trivial things to never merge upstream ever
 # Don't merge this without protecting the gccisms.
@@ -75,20 +74,14 @@
 
 # evdev keyboard map fix
 #Patch5013: xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch
-Patch5014: xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch
+Patch5013: xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch
 # Patch5015: xserver-1.5.0-enable-selinux.patch
 Patch6000: xserver-1.5.0-hide-cursor.patch
 Patch6001: xserver-1.5.0-edid-backport.patch
 
-# FDO bug 14373 (FIXED), RH bug #460545
-Patch6002: xserver-1.5.0-xkb-core-kbd-map-fix.patch
-
 # force mode debugging on for randr 1.2 drivers
 Patch6003: xserver-1.5.1-mode-debug.patch
 
-# backport int10 silence and memory leaks
-Patch6004: xserver-1.5.1-int10-leaks.patch
-
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -519,6 +512,12 @@
 
 
 %changelog
+* Fri Oct 10 2008 Adam Jackson <ajax at redhat.com> 1.5.2-1
+- xserver 1.5.2
+- xserver-1.5.0-comment-out-glxdri2.c: Drop, no longer relevant.
+- xserver-1.5.0-xkb-core-kbd-map-fix.patch: Drop, merged.
+- xserver-1.5.1-int10-leaks.patch: Drop, merged.
+
 * Fri Oct 10 2008 Adam Jackson <ajax at redhat.com> 1.5.1-11
 - xserver-1.3.0-no-prerelease-warning.patch: Drop.
 


--- xserver-1.5.0-comment-out-glxdri2.c DELETED ---


--- xserver-1.5.0-xkb-core-kbd-map-fix.patch DELETED ---


--- xserver-1.5.1-int10-leaks.patch DELETED ---