rpms/xorg-x11-server/devel .cvsignore, 1.74, 1.75 sources, 1.69, 1.70 xorg-x11-server.spec, 1.484, 1.485 xserver-1.4.99-document-fontpath-correctly.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-serv18538

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xserver-1.4.99-document-fontpath-correctly.patch 
Log Message:
* Mon Sep 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.901-1
- xserver 1.6.99.901 
- Re-enable Xdmx
- xserver-1.4.99-document-fontpath-correctly.patch: Drop



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	7 Sep 2009 05:54:49 -0000	1.74
+++ .cvsignore	15 Sep 2009 00:46:01 -0000	1.75
@@ -1 +1 @@
-xorg-server-1.6.99.900.tar.bz2
+xorg-server-1.6.99.901.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	7 Sep 2009 05:54:50 -0000	1.69
+++ sources	15 Sep 2009 00:46:01 -0000	1.70
@@ -1 +1 @@
-e12b367b44e27def991f4542d85a9c63  xorg-server-1.6.99.900.tar.bz2
+f30ecd48ae45f5bbe62fd17e81ee28c3  xorg-server-1.6.99.901.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -p -r1.484 -r1.485
--- xorg-x11-server.spec	8 Sep 2009 18:10:23 -0000	1.484
+++ xorg-x11-server.spec	15 Sep 2009 00:46:01 -0000	1.485
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.99.900
-Release:   2%{?dist}
+Version:   1.6.99.901
+Release:   1%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -52,7 +52,6 @@ Patch5: xserver-1.4.99-pic-libxf86config
 Patch103:  xserver-1.5.0-bg-none-root.patch
 Patch104:  dri2-page-flip.patch
 
-Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 Patch2014:  xserver-1.5.0-projector-fb-size.patch
 
 # Trivial things to never merge upstream ever:
@@ -96,7 +95,6 @@ Patch6033: xserver-1.6.99-default-modes.
 %endif
 
 %define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev
-# XXX dmx
 %define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
 
 BuildRequires: git-core
@@ -203,7 +201,6 @@ but it is an X server itself in which yo
 is a very useful tool for developers who wish to test their
 applications without running them on their real X server.
 
-%if 0
 %package Xdmx
 Summary: Distributed Multihead X Server and utilities
 Group: User Interface/X
@@ -220,7 +217,6 @@ for Xdmx would be to provide multi-head 
 each of which has a single display device attached to it.  A complex
 application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays
 (each attached to one of 16 computers) into a unified 5120x4096 display.
-%endif
 
 %package Xvfb
 Summary: A X Windows System virtual framebuffer X server.
@@ -456,7 +452,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/Xnest
 %{_mandir}/man1/Xnest.1*
 
-%if 0
 %files Xdmx
 %defattr(-,root,root,-)
 %{_bindir}/Xdmx
@@ -475,7 +470,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dmxtodmx.1*
 %{_mandir}/man1/vdltodmx.1*
 %{_mandir}/man1/xdmxconfig.1*
-%endif
 
 %files Xvfb
 %defattr(-,root,root,-)
@@ -506,6 +500,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Sep 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.901-1
+- xserver 1.6.99.901 
+- Re-enable Xdmx
+- xserver-1.4.99-document-fontpath-correctly.patch: Drop
+
 * Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 1.6.99.900-2
 - Fix -source subtree to not include generated C files from hw/xfree86.
   Actually, just remove all C files from hw/xfree86 in -source, since we


--- xserver-1.4.99-document-fontpath-correctly.patch DELETED ---