rpms/xorg-x11-server/devel .cvsignore, 1.43, 1.44 commitid, 1.15, 1.16 sources, 1.37, 1.38 xorg-x11-server.spec, 1.325, 1.326 xserver-1.5.0-quirk-acr.patch, 1.1, NONE
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Tue Apr 15 02:21:31 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19703
Modified Files:
.cvsignore commitid sources xorg-x11-server.spec
Removed Files:
xserver-1.5.0-quirk-acr.patch
Log Message:
* Tue Apr 15 2008 Dave Airlie <airlied at redhat.com> 1.4.99.901-22.20080415
- rebase to upstream server 1.5 branch from today - drop acr quirk
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore 8 Apr 2008 20:59:51 -0000 1.43
+++ .cvsignore 15 Apr 2008 02:20:52 -0000 1.44
@@ -1 +1 @@
-xorg-server-20080407.tar.bz2
+xorg-server-20080415.tar.bz2
Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- commitid 8 Apr 2008 20:59:51 -0000 1.15
+++ commitid 15 Apr 2008 02:20:52 -0000 1.16
@@ -1 +1 @@
-85b855f26f1578d52e9ed1dd0e3a9a1340ef1a2d
+5a2b538c1bc020af5bc33027ba0d9698338dca46
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources 8 Apr 2008 20:59:51 -0000 1.37
+++ sources 15 Apr 2008 02:20:52 -0000 1.38
@@ -1 +1 @@
-3a69d1948a47ecd77d8e2adc9d34179a xorg-server-20080407.tar.bz2
+2552f3c3b3c2c61ca85fd3d1515efcff xorg-server-20080415.tar.bz2
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- xorg-x11-server.spec 10 Apr 2008 14:09:39 -0000 1.325
+++ xorg-x11-server.spec 15 Apr 2008 02:20:52 -0000 1.326
@@ -15,12 +15,12 @@
# RHEL5 bugfix sync
%define pkgname xorg-server
-%define gitdate 20080407
+%define gitdate 20080415
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.4.99.901
-Release: 21.%{gitdate}%{?dist}
+Release: 22.%{gitdate}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -52,7 +52,6 @@
Patch2013: xserver-1.4.99-document-fontpath-correctly.patch
# Trivial things to maybe merge upstream at next rebase
-Patch4000: xserver-1.5.0-quirk-acr.patch
# Trivial things to never merge upstream ever
# Don't merge this without protecting the gccisms.
@@ -514,6 +513,9 @@
%changelog
+* Tue Apr 15 2008 Dave Airlie <airlied at redhat.com> 1.4.99.901-22.20080415
+- rebase to upstream server 1.5 branch from today - drop acr quirk
+
* Thu Apr 10 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-21.20080407
- xserver-1.5.0-selinux-off-by-default.patch: Re-disable selinux by default,
again, in a way that lets you enable it if you really want to.
--- xserver-1.5.0-quirk-acr.patch DELETED ---
More information about the fedora-extras-commits
mailing list