debian/10-synaptics.fdi | 13 ------------- debian/11-x11-synaptics.fdi | 16 ++++++++++++++++ debian/changelog | 10 ++++++++++ debian/rules | 2 +- debian/xserver-xorg-input-synaptics.README.Debian | 17 +++++++++++++---- 5 files changed, 40 insertions(+), 18 deletions(-)
New commits: commit a7e324a425b7bc5bf6f7b75a6c5001a15b8761ce Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Aug 25 23:24:56 2008 +0900 Actually install the renamed fdi file (and with 0644 perms) Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> diff --git a/debian/rules b/debian/rules index 40c18e7..4499a68 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,7 @@ install: build # install the package into debian/xserver-xorg-input-synaptics $(MAKE) install BUILD_MODULAR=y PREFIX=/usr DESTDIR=$(CURDIR)/debian/xserver-xorg-input-synaptics install -d debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty - install debian/10-synaptics.fdi debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty/ + install -m 0644 debian/11-x11-synaptics.fdi debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty/ # Build architecture-independent files here. commit 3c678a6f9005779780535c7aebba73f2d61b51a4 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Aug 25 23:14:09 2008 +0900 Update fdi file for appletouch and amend README.Debian README.Debian now mentions automatic configuration and provides a clearer example for the Server (manual) configuration. Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> diff --git a/debian/11-x11-synaptics.fdi b/debian/11-x11-synaptics.fdi index 05c8428..2f0ace4 100644 --- a/debian/11-x11-synaptics.fdi +++ b/debian/11-x11-synaptics.fdi @@ -3,10 +3,13 @@ <device> <match key="info.capabilities" contains="input.touchpad"> <match key="info.product" contains="Synaptics TouchPad"> - <merge key="input.x11_driver" type="string">synaptics</merge> + <merge key="input.x11_driver" type="string">synaptics</merge> </match> <match key="info.product" contains="AlpsPS/2 ALPS"> - <merge key="input.x11_driver" type="string">synaptics</merge> + <merge key="input.x11_driver" type="string">synaptics</merge> + </match> + <match key="info.product" contains="appletouch"> + <merge key="input.x11_driver" type="string">synaptics</merge> </match> </match> </device> diff --git a/debian/changelog b/debian/changelog index c665586..e2763d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +xfree86-driver-synaptics (0.14.7~git20070706-3.lenny1) unstable; urgency=low + + * Add appletouch support in the fdi file (Closes: #495799). + * Install the fdi file with 0644 permissions. + * Updated xserver-xorg-input-synaptics.README.Debian to mention automatic + configuration and show a clearer example for the Server (manual) + configuration (Closes: #443995 and also Closes: #492120). + + -- Mattia Dongili <[EMAIL PROTECTED]> Mon, 25 Aug 2008 22:30:08 +0900 + xfree86-driver-synaptics (0.14.7~git20070706-2.1.lenny1) unstable; urgency=low * Add 10-synaptics.fdi, installed in /usr/share/hal/fdi/policy/20thirdparty, diff --git a/debian/xserver-xorg-input-synaptics.README.Debian b/debian/xserver-xorg-input-synaptics.README.Debian index 02e25b7..6d20ebc 100644 --- a/debian/xserver-xorg-input-synaptics.README.Debian +++ b/debian/xserver-xorg-input-synaptics.README.Debian @@ -16,8 +16,16 @@ security notice about SHMConfig: multiuser environment. All local users can change the parameters at any time. -Configuration -------------- +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 + + +Manual configuration +-------------------- 1. Load the driver by changing the X.Org/XFree86 configuration file (/etc/X11/xorg.conf or /etc/X11/XF86Config-4) through adding the line 'Load @@ -28,7 +36,7 @@ following lines: Section "InputDevice" Driver "synaptics" - Identifier "Mouse[1]" + Identifier "touchpad" Option "Device" "/dev/psaux" Option "Protocol" "auto-dev" # @@ -59,7 +67,8 @@ The Option "Repeater" is at the moment for testing. Section "ServerLayout" ... - InputDevice "Mouse[1]" "CorePointer" + InputDevice "touchpad" "CorePointer" + InputDevice "USB Mouse" "SendCoreEvents" ... Note! You can not have more than one core pointer, so if you want commit 25ccbb1f1fc135a40e6e9537c3f2014d94351af1 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Aug 25 22:56:49 2008 +0900 Rename fdi file to the same name as upstream This is just to avoid any confusion when then 0.15.0 package will make its debut. Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> diff --git a/debian/10-synaptics.fdi b/debian/10-synaptics.fdi deleted file mode 100644 index 05c8428..0000000 --- a/debian/10-synaptics.fdi +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<deviceinfo version="0.2"> - <device> - <match key="info.capabilities" contains="input.touchpad"> - <match key="info.product" contains="Synaptics TouchPad"> - <merge key="input.x11_driver" type="string">synaptics</merge> - </match> - <match key="info.product" contains="AlpsPS/2 ALPS"> - <merge key="input.x11_driver" type="string">synaptics</merge> - </match> - </match> - </device> -</deviceinfo> diff --git a/debian/11-x11-synaptics.fdi b/debian/11-x11-synaptics.fdi new file mode 100644 index 0000000..05c8428 --- /dev/null +++ b/debian/11-x11-synaptics.fdi @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<deviceinfo version="0.2"> + <device> + <match key="info.capabilities" contains="input.touchpad"> + <match key="info.product" contains="Synaptics TouchPad"> + <merge key="input.x11_driver" type="string">synaptics</merge> + </match> + <match key="info.product" contains="AlpsPS/2 ALPS"> + <merge key="input.x11_driver" type="string">synaptics</merge> + </match> + </match> + </device> +</deviceinfo> -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]