rpms/xorg-x11-server/devel .cvsignore, 1.32, 1.33 commitid, 1.5, 1.6 sources, 1.27, 1.28 xorg-x11-server.spec, 1.295, 1.296 xserver-1.4.99-apm-typedefs.patch, 1.2, NONE xserver-1.4.99-openchrome.patch, 1.1, NONE xserver-1.4.99-xephyr-dri.patch, 1.1, NONE

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28149/devel

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Removed Files:
	xserver-1.4.99-apm-typedefs.patch 
	xserver-1.4.99-openchrome.patch 
	xserver-1.4.99-xephyr-dri.patch 
Log Message:
today's git snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	21 Feb 2008 21:42:28 -0000	1.32
+++ .cvsignore	22 Feb 2008 22:49:27 -0000	1.33
@@ -1 +1 @@
-xorg-server-20080221.tar.bz2
+xorg-server-20080222.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- commitid	21 Feb 2008 21:42:28 -0000	1.5
+++ commitid	22 Feb 2008 22:49:27 -0000	1.6
@@ -1 +1 @@
-c14fd2a5cb3f45d5c4502e09f55f5e3732c5e698
+347db49ebe4596db16455ea8a1a608cfa826c5c7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	21 Feb 2008 21:42:28 -0000	1.27
+++ sources	22 Feb 2008 22:49:27 -0000	1.28
@@ -1 +1 @@
-d3dd5a48d161bcb5d02cf897b1f49ebd  xorg-server-20080221.tar.bz2
+43e13379e5ef621ba5c94bb0623bf53d  xorg-server-20080222.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- xorg-x11-server.spec	21 Feb 2008 21:42:28 -0000	1.295
+++ xorg-x11-server.spec	22 Feb 2008 22:49:27 -0000	1.296
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080221
+%define gitdate 20080222
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.1
-Release:   0.22.%{?gitdate}%{?dist}
+Release:   0.23.%{?gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -57,13 +57,9 @@
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 
 # Trivial things to maybe merge upstream at next rebase
-#Patch4003: argh-pixman.patch #fixme
-Patch4004: xserver-1.4.99-xephyr-dri.patch
-Patch4005: xserver-1.4.99-openchrome.patch
+#Patch4000:
 
 # Trivial things to never merge upstream ever
-# This should be fixed in the kernel.
-Patch5000: xserver-1.4.99-apm-typedefs.patch
 # Don't merge this without protecting the gccisms.
 Patch5001: xserver-1.4.99-alloca-poison.patch
 # This really could be done prettier.
@@ -513,6 +509,10 @@
 
 
 %changelog
+* Fri Feb 22 2008 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.23
+- Today's git snapshot.  Xinerama and XKB fixes, patch merging, etc.
+- Remove some dead patches.
+
 * Thu Feb 21 2008 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.22
 - Today's git snapshot, misc bugfixes.
 


--- xserver-1.4.99-apm-typedefs.patch DELETED ---


--- xserver-1.4.99-openchrome.patch DELETED ---


--- xserver-1.4.99-xephyr-dri.patch DELETED ---