rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.373, 1.374 xserver-1.5.2-disable-kbd-mouse.patch, 1.3, 1.4

[Peter Hutterer]

Author: whot

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

Modified Files:
	xorg-x11-server.spec xserver-1.5.2-disable-kbd-mouse.patch 
Log Message:
* Wed Oct 22 2008 Peter Hutterer <peter.hutterer at redhat.com>
- Update xserver-1.5.2-disable-kbd-mouse.patch: add line to xorg.conf man-page
  stating that devices are disabled if AEI is on.




Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- xorg-x11-server.spec	21 Oct 2008 23:56:21 -0000	1.373
+++ xorg-x11-server.spec	22 Oct 2008 06:12:03 -0000	1.374
@@ -526,6 +526,10 @@
 
 %changelog
 * Wed Oct 22 2008 Peter Hutterer <peter.hutterer at redhat.com>
+- Update xserver-1.5.2-disable-kbd-mouse.patch: add line to xorg.conf man-page
+  stating that devices are disabled if AEI is on.
+
+* Wed Oct 22 2008 Peter Hutterer <peter.hutterer at redhat.com>
 - fix typo in xserver-1.5.2-no-duplicate-devices.patch
 
 * Mon Oct 20 2008 Adam Jackson <ajax at redhat.com> 1.5.2-8

xserver-1.5.2-disable-kbd-mouse.patch:

Index: xserver-1.5.2-disable-kbd-mouse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.2-disable-kbd-mouse.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xserver-1.5.2-disable-kbd-mouse.patch	21 Oct 2008 23:56:21 -0000	1.3
+++ xserver-1.5.2-disable-kbd-mouse.patch	22 Oct 2008 06:12:03 -0000	1.4
@@ -94,6 +94,18 @@
  	autoconfig = TRUE;
  	break;
        }
+diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
+index 0774563..99fcdb3 100644
+--- a/hw/xfree86/doc/man/xorg.conf.man.pre
++++ b/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -698,6 +698,7 @@ the X server to load. Disabled by default.
+ If enabled, don't add the standard keyboard and mouse drivers, if there are no
+ input devices in the config file.  Enabled by default if AutoAddDevices and
+ AutoEnableDevices is enabled, otherwise disabled.
++If AllowEmptyInput is on, devices using the kbd or mouse driver are ignored.
+ .TP 7
+ .BI "Option \*qAutoAddDevices\*q \*q" boolean \*q
+ If this option is disabled, then no devices will be added from HAL events.
 -- 
 1.6.0.1