X Strike Force X.Org X11 SVN commit: r1040 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2006-01-08 22:31:13 -0500 (Sun, 08 Jan 2006)
New Revision: 1040
Added:
trunk/debian/patches/general/021_evdev_manpage.diff
Modified:
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/NEWS
trunk/debian/changelog
trunk/debian/patches/series
trunk/debian/xserver-xorg.install.alpha
trunk/debian/xserver-xorg.install.amd64
trunk/debian/xserver-xorg.install.arm
trunk/debian/xserver-xorg.install.hppa
trunk/debian/xserver-xorg.install.i386
trunk/debian/xserver-xorg.install.ia64
trunk/debian/xserver-xorg.install.m68k
trunk/debian/xserver-xorg.install.powerpc
trunk/debian/xserver-xorg.install.sparc
Log:
* Add general/021_evdev_manpage.diff taken from
https://bugs.freedesktop.org/show_bug.cgi?id=968. This will at least
document the driver better.
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/MANIFEST.alpha.in 2006-01-09 03:31:13 UTC (rev 1040)
@@ -3487,6 +3487,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/MANIFEST.amd64.in 2006-01-09 03:31:13 UTC (rev 1040)
@@ -3490,6 +3490,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/MANIFEST.arm.in 2006-01-09 03:31:13 UTC (rev 1040)
@@ -3474,6 +3474,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/MANIFEST.hppa.in 2006-01-09 03:31:13 UTC (rev 1040)
@@ -3327,6 +3327,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/MANIFEST.i386.in 2006-01-09 03:31:13 UTC (rev 1040)
@@ -3499,6 +3499,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/MANIFEST.ia64.in 2006-01-09 03:31:13 UTC (rev 1040)
@@ -3446,6 +3446,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/MANIFEST.m68k.in 2006-01-09 03:31:13 UTC (rev 1040)
@@ -3474,6 +3474,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/MANIFEST.powerpc.in 2006-01-09 03:31:13 UTC (rev 1040)
@@ -3484,6 +3484,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/MANIFEST.sparc.in 2006-01-09 03:31:13 UTC (rev 1040)
@@ -3505,6 +3505,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/NEWS 2006-01-09 03:31:13 UTC (rev 1040)
@@ -5,7 +5,8 @@
and going with the upstream version. If you are using evdev, you'll have
to add a 'Load "evdev"' line to your Module section of your xorg.conf. In
addition, you'll have to tell your input device that uses evdev to use the
- "evdev" Driver.
+ "evdev" Driver. The driver is documented in the evdev.4x manpage which is
+ now included with xserver-xorg.
-- David Nusinow <dnusinow@debian.org> Sun, 8 Jan 2006 20:28:15 -0500
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/changelog 2006-01-09 03:31:13 UTC (rev 1040)
@@ -36,8 +36,11 @@
default
+ Document in NEWS file how to get evdev support working. Thanks to Ian
Wienand for instructions.
+ + Add general/021_evdev_manpage.diff taken from
+ https://bugs.freedesktop.org/show_bug.cgi?id=968. This will at least
+ document the driver better.
- -- David Nusinow <dnusinow@debian.org> Sun, 8 Jan 2006 20:32:45 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 8 Jan 2006 22:21:24 -0500
xorg-x11 (6.9.0.dfsg.1-2) unstable; urgency=low
Added: trunk/debian/patches/general/021_evdev_manpage.diff
===================================================================
--- trunk/debian/patches/general/021_evdev_manpage.diff 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/patches/general/021_evdev_manpage.diff 2006-01-09 03:31:13 UTC (rev 1040)
@@ -0,0 +1,73 @@
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile
+===================================================================
+--- trunk.orig/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 2005-12-27 02:34:19.000000000 -0500
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 2006-01-08 22:19:33.000000000 -0500
+@@ -19,6 +19,10 @@
+
+ InstallInputObjectModule($(DRIVER),$(MODULEDIR))
+
++#if !defined(XF86DriverSDK)
++InstallModuleManPage($(DRIVER))
++#endif
++
+ DependTarget()
+
+ InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input)
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.man
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.man 2006-01-08 22:18:58.000000000 -0500
+@@ -0,0 +1,53 @@
++.\" shorthand for double quote that works everywhere.
++.ds q \N'34'
++.TH EVDEV __drivermansuffix__ __vendorversion__
++.SH NAME
++evdev \- Generic Linux input driver
++.SH SYNOPSIS
++.nf
++.B "Section \*qInputDevice\*q"
++.BI " Identifier \*q" devname \*q
++.B " Driver \*qevdev\*q"
++.BI " Option \*qDevice\*q \*q" devpath \*q
++\ \ ...
++.B EndSection
++.fi
++.SH DESCRIPTION
++.B evdev
++is an __xservername__ input driver for Linux\'s generic event devices. It
++therefore supports all input devices that the kernel knows about, including
++most mice and keyboards.
++.PP
++The
++.B evdev
++driver can serve as both a pointer and a keyboard input device, and may be
++used as both the core keyboard and the core pointer. Multiple input devices
++are supported by multiple instances of this driver, with one Load
++directive for evdev in the Module section of your __xconfigfile__ for each
++input device that will use this driver.
++.PP
++.SH SUPPORTED HARDWARE
++In general, any input device that the kernel has a driver for can be accessed
++through the
++.B evdev
++driver. See the Linux kernel documentation for a complete list.
++.PP
++.SH CONFIGURATION DETAILS
++Please refer to __xconfigfile__(__filemansuffix__) for general configuration
++details and for options that can be used with all input drivers. This
++section only covers configuration details specific to this driver.
++.PP
++The following driver
++.B Options
++are supported:
++.TP 7
++.BI "Option \*qDevice\*q \*q" string \*q
++Specifies the device through which the device can be accessed. This will
++generally be of the form \*q/dev/input/eventX\*q, where X is some integer.
++The mapping from device node to hardware is system-dependent. This option is
++mandatory, and there is no default setting.
++.SH AUTHORS
++Kristian Høgsberg.
++.SH "SEE ALSO"
++__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
++README.mouse.
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/patches/series 2006-01-09 03:31:13 UTC (rev 1040)
@@ -20,6 +20,7 @@
general/018_mesa_debug_fglrx.diff -p0
general/019_iso8859-15_Compose_fix.diff -p0
general/020_acpi_event_loop_fix.diff -p0
+general/021_evdev_manpage.diff
general/022_disable_xmh.diff
general/023_specs_doc_fixes.diff -p0
general/025b_xkb_README_typos.diff -p0
Modified: trunk/debian/xserver-xorg.install.alpha
===================================================================
--- trunk/debian/xserver-xorg.install.alpha 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/xserver-xorg.install.alpha 2006-01-09 03:31:13 UTC (rev 1040)
@@ -105,6 +105,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/xserver-xorg.install.amd64
===================================================================
--- trunk/debian/xserver-xorg.install.amd64 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/xserver-xorg.install.amd64 2006-01-09 03:31:13 UTC (rev 1040)
@@ -122,6 +122,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/xserver-xorg.install.arm
===================================================================
--- trunk/debian/xserver-xorg.install.arm 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/xserver-xorg.install.arm 2006-01-09 03:31:13 UTC (rev 1040)
@@ -99,6 +99,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/xserver-xorg.install.hppa
===================================================================
--- trunk/debian/xserver-xorg.install.hppa 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/xserver-xorg.install.hppa 2006-01-09 03:31:13 UTC (rev 1040)
@@ -101,6 +101,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/xserver-xorg.install.i386
===================================================================
--- trunk/debian/xserver-xorg.install.i386 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/xserver-xorg.install.i386 2006-01-09 03:31:13 UTC (rev 1040)
@@ -128,6 +128,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/xserver-xorg.install.ia64
===================================================================
--- trunk/debian/xserver-xorg.install.ia64 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/xserver-xorg.install.ia64 2006-01-09 03:31:13 UTC (rev 1040)
@@ -124,6 +124,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/xserver-xorg.install.m68k
===================================================================
--- trunk/debian/xserver-xorg.install.m68k 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/xserver-xorg.install.m68k 2006-01-09 03:31:13 UTC (rev 1040)
@@ -101,6 +101,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/xserver-xorg.install.powerpc
===================================================================
--- trunk/debian/xserver-xorg.install.powerpc 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/xserver-xorg.install.powerpc 2006-01-09 03:31:13 UTC (rev 1040)
@@ -103,6 +103,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Modified: trunk/debian/xserver-xorg.install.sparc
===================================================================
--- trunk/debian/xserver-xorg.install.sparc 2006-01-09 01:37:12 UTC (rev 1039)
+++ trunk/debian/xserver-xorg.install.sparc 2006-01-09 03:31:13 UTC (rev 1040)
@@ -127,6 +127,7 @@
usr/X11R6/man/man4/dmc.4x
usr/X11R6/man/man4/dynapro.4x
usr/X11R6/man/man4/elographics.4x
+usr/X11R6/man/man4/evdev.4x
usr/X11R6/man/man4/fbdev.4x
usr/X11R6/man/man4/fbdevhw.4x
usr/X11R6/man/man4/fpit.4x
Reply to: