rpms/xorg-x11-server/devel .cvsignore, 1.59, 1.60 commitid, 1.22, 1.23 sources, 1.54, 1.55 xorg-x11-server.spec, 1.442, 1.443 xserver-1.5.0-bad-fbdev-thats-mine.patch, 1.2, NONE

[Peter Hutterer]

Author: whot

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

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Removed Files:
	xserver-1.5.0-bad-fbdev-thats-mine.patch 
Log Message:
* Mon Jul 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-9.20090706
- Today's git snapshot.
- xserver-1.5.0-bad-fbdev-thats-mine.patch: Drop. Merged upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	19 Jun 2009 07:03:32 -0000	1.59
+++ .cvsignore	6 Jul 2009 05:58:35 -0000	1.60
@@ -1 +1 @@
-xorg-server-20090618.tar.bz2
+xorg-server-20090706.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- commitid	19 Jun 2009 07:09:28 -0000	1.22
+++ commitid	6 Jul 2009 05:58:35 -0000	1.23
@@ -1 +1 @@
-1e9907499c27321a2aa5dc8a75a375b7a82c999a
+89cf81cd85919e3dbb5adff5e6c6056c7990b60f


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	19 Jun 2009 07:03:33 -0000	1.54
+++ sources	6 Jul 2009 05:58:35 -0000	1.55
@@ -1 +1 @@
-ca0f369109b6f9bb62eca60fd5a2302f  xorg-server-20090618.tar.bz2
+f8acd1118a283e21fc3dcadbaf5334de  xorg-server-20090706.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -p -r1.442 -r1.443
--- xorg-x11-server.spec	29 Jun 2009 21:52:47 -0000	1.442
+++ xorg-x11-server.spec	6 Jul 2009 05:58:36 -0000	1.443
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090618
+%define gitdate 20090706
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   8.%{gitdate}%{?dist}
+Release:   9.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -57,7 +57,6 @@ Patch2014:  xserver-1.5.0-projector-fb-s
 # Trivial things to never merge upstream ever:
 # This really could be done prettier.
 Patch5002:  xserver-1.4.99-ssh-isnt-local.patch
-Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch
 
 # force mode debugging on for randr 1.2 drivers
 Patch6002: xserver-1.5.1-mode-debug.patch
@@ -517,6 +516,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-9.20090706
+- Today's git snapshot.
+- xserver-1.5.0-bad-fbdev-thats-mine.patch: Drop. Merged upstream.
+
 * Mon Jun 29 2009 Adam Jackson <ajax at redhat.com> 1.6.99-8.20090618
 - Move xkb requires to -common subpackage, Xephyr needs them too.
 


--- xserver-1.5.0-bad-fbdev-thats-mine.patch DELETED ---