debian/changelog | 3 + debian/patches/03-man-no-hal.patch | 20 ++++++++++++ debian/patches/series | 1 debian/xserver-xorg-input-synaptics.README.Debian | 36 +++++----------------- 4 files changed, 32 insertions(+), 28 deletions(-)
New commits: commit c6a5c72572f081e9afb5669c1d1a61ce42d72142 Author: Julien Cristau <jcris...@debian.org> Date: Sun Jan 10 09:43:31 2010 +0000 Drop references to hal from the synaptics(4) man page. diff --git a/debian/changelog b/debian/changelog index 9610d60..ba64ff5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,8 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low [ Julien Cristau ] * Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. - * Drop references to hal from debian/NEWS and README.Debian. + * Drop references to hal from debian/NEWS, README.Debian and synaptics(4) + (closes: #564549). -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 08 Dec 2009 16:15:58 +0200 diff --git a/debian/patches/03-man-no-hal.patch b/debian/patches/03-man-no-hal.patch new file mode 100644 index 0000000..0650598 --- /dev/null +++ b/debian/patches/03-man-no-hal.patch @@ -0,0 +1,20 @@ +Index: xserver-xorg-input-synaptics/man/synaptics.man +=================================================================== +--- xserver-xorg-input-synaptics.orig/man/synaptics.man ++++ xserver-xorg-input-synaptics/man/synaptics.man +@@ -871,15 +871,6 @@ + 32 bit unsigned, 2 values (read-only), vertical, horizontal in units/millimeter. + + .SH "NOTES" +-There is an example hal policy file in +-.I ${sourcecode}/fdi/11-x11-synaptics.fdi +-which will enable the driver based on the information if the hardware +-is available. Feel free to copy it to +-.I /etc/hal/fdi/policy +-and customize it to your needs. You can pass custom options to the driver +-using x11_options properties. Note that this requires xorg-server-1.5 or +-higher. +-.LP + If either of + .BI "Protocol \*q" auto-dev \*q + (default) or diff --git a/debian/patches/series b/debian/patches/series index 3bb3f92..d1c01f7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01-synaptics-dont-grab-if-not-on-current-VT.patch 02-do-not-use-synaptics-for-keyboards.patch +03-man-no-hal.patch commit e9d68b45996ec8faf72b05726277771a93027408 Author: Julien Cristau <jcris...@debian.org> Date: Sun Jan 10 09:41:01 2010 +0000 Drop references to hal from README.Debian diff --git a/debian/changelog b/debian/changelog index 33f1dda..9610d60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low [ Julien Cristau ] * Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. - * Drop references to hal from debian/NEWS. + * Drop references to hal from debian/NEWS and README.Debian. -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 08 Dec 2009 16:15:58 +0200 diff --git a/debian/xserver-xorg-input-synaptics.README.Debian b/debian/xserver-xorg-input-synaptics.README.Debian index 6f5e957..d724ec0 100644 --- a/debian/xserver-xorg-input-synaptics.README.Debian +++ b/debian/xserver-xorg-input-synaptics.README.Debian @@ -1,33 +1,16 @@ xserver-xorg-input-synaptics for Debian ------------------------------------ +--------------------------------------- This package contains the Synaptics TouchPad driver for X.Org X server. See also the README file for details on configuration options. -The following notes are reported from the INSTALL instructions of upstream -package (by Stefan Gmeiner <riddle...@freesurf.ch>), but first of all a -security notice about SHMConfig: - - If you want to be able to change driver parameters without - restarting the X server, one option is to enable the "SHMConfig" option in - the X configuration file. You can then use the "synclient" program to - query and modify driver parameters on the fly. - SECURITY NOTE! This is not secure if you are in an untrusted - multiuser environment. All local users can change the parameters at any - time. - - Since version 1.1 the driver doesn't require doesn't require the - SHMConfig option anymore to allow runtime configuration changes, - synclient will only use the shared memory segment when invoked with - the -s option. - -Xorg auto-configuration ------------------------ -Recent X.Org has support for automatic configuration. The synaptics driver does -not support automatic configuration yet but the information required is -supplied by a third party fdi script through HAL. -The file is /usr/share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi, -if you need to customize it, you can first copy it to -/etc/hal/fdi/policy and the edit it to match your requirements. + + +Runtime configuration +--------------------- + +The synclient and xinput tools allow configuring various aspects of the +driver's behaviour. See the synaptics(4) man page for details of the +configurable options. Manual configuration @@ -62,7 +45,6 @@ Section "InputDevice" # Option "MinSpeed" "0.06" # Option "MaxSpeed" "0.12" # Option "AccelFactor" "0.0010" -# Option "SHMConfig" "on" # Option "Repeater" "/dev/ps2mouse" EndSection -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org