debian/patches/02-do-not-use-synaptics-for-keyboards.patch | 60 +++----------
1 file changed, 14 insertions(+), 46 deletions(-)
New commits:
commit 53f834a8757a0c05ec476633c2d6ae191e7eea0b
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Fri Mar 21 11:44:24 2014 +0100
refresh 02-do-not-use-synaptics-for-keyboards.patch
diff --git a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
index b6741c4..6fc7c95 100644
--- a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
+++ b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
@@ -1,55 +1,23 @@
do not use the synaptics driver for devices advertising themselves as keyboards
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524130
-Index: xserver-xorg-input-synaptics.git/conf/11-x11-synaptics.fdi
-===================================================================
---- xserver-xorg-input-synaptics.git.orig/conf/11-x11-synaptics.fdi
2013-12-10 13:41:43.646594748 +0100
-+++ xserver-xorg-input-synaptics.git/conf/11-x11-synaptics.fdi 2013-12-10
13:41:43.642594750 +0100
-@@ -9,27 +9,31 @@
+diff --git a/conf/11-x11-synaptics.fdi b/conf/11-x11-synaptics.fdi
+index a898875..8714a59 100644
+--- a/conf/11-x11-synaptics.fdi
++++ b/conf/11-x11-synaptics.fdi
+@@ -9,6 +9,7 @@
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.touchpad">
-- <merge key="input.x11_driver" type="string">synaptics</merge>
-- <!-- Arbitrary options can be passed to the driver using
-- the input.x11_options property since xorg-server-1.5. -->
-- <!-- EXAMPLES:
-- Maximum movement of the finger for detecting a tap
-- <merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
-+ <!-- do not use the synaptics driver for devices advertising
-+ themselves as keyboards -->
+ <match key="info.capabilities" contains_not="input.keyboard">
-+ <merge key="input.x11_driver" type="string">synaptics</merge>
-+ <!-- Arbitrary options can be passed to the driver using
-+ the input.x11_options property since xorg-server-1.5. -->
-+ <!-- EXAMPLES:
-+ Maximum movement of the finger for detecting a tap
-+ <merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
-
-- Enable vertical scrolling when dragging along the right edge
-- <merge key="input.x11_options.VertEdgeScroll" type="string">true</merge>
-+ Enable vertical scrolling when dragging along the right edge
-+ <merge key="input.x11_options.VertEdgeScroll"
type="string">true</merge>
-
-- Enable vertical scrolling when dragging with two fingers anywhere on
the touchpad
-- <merge key="input.x11_options.VertTwoFingerScroll"
type="string">true</merge>
-+ Enable vertical scrolling when dragging with two fingers anywhere
on the touchpad
-+ <merge key="input.x11_options.VertTwoFingerScroll"
type="string">true</merge>
-
-- Enable horizontal scrolling when dragging with two fingers anywhere on
the touchpad
-- <merge key="input.x11_options.HorizTwoFingerScroll"
type="string">true</merge>
-+ Enable horizontal scrolling when dragging with two fingers anywhere
on the touchpad
-+ <merge key="input.x11_options.HorizTwoFingerScroll"
type="string">true</merge>
-
-- If on, circular scrolling is used
-- <merge key="input.x11_options.CircularScrolling"
type="string">true</merge>
-+ If on, circular scrolling is used
-+ <merge key="input.x11_options.CircularScrolling"
type="string">true</merge>
-
-- For other possible options, check CONFIGURATION DETAILS in synaptics
man page
-- -->
-+ For other possible options, check CONFIGURATION DETAILS in
synaptics man page
-+ -->
+ <merge key="input.x11_driver" type="string">synaptics</merge>
+ <!-- Arbitrary options can be passed to the driver using
+ the input.x11_options property since xorg-server-1.5. -->
+@@ -34,6 +35,7 @@
+ <match key="info.product" contains="Apple|bcm5974">
+ <merge key="input.x11_options.SoftButtonAreas" type="string">0 0
0 0 0 0 0 0</merge>
+ </match>
+ </match>
</match>
- </device>
- </deviceinfo>
+
+ <match
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wqwwv-0006yx...@moszumanska.debian.org
