diff -u xfree86-driver-synaptics-0.99.3/debian/changelog xfree86-driver-synaptics-0.99.3/debian/changelog --- xfree86-driver-synaptics-0.99.3/debian/changelog +++ xfree86-driver-synaptics-0.99.3/debian/changelog @@ -1,3 +1,14 @@ +xfree86-driver-synaptics (0.99.3-2ubuntu2) jaunty; urgency=low + + [Alberto Milone] + * debian/patches/105_always_enable_multifinger_click.patch: + - Drop patch + * debian/patches/105_correct_multifinger_click.patch: + - Fix inverted buttons + - Restore ability to drag and drop with physical buttons + + -- Alberto Milone (tseliot) Sat, 31 Jan 2009 18:48:37 +0100 + xfree86-driver-synaptics (0.99.3-2ubuntu1) jaunty; urgency=low * Merge from Debian experimental. diff -u xfree86-driver-synaptics-0.99.3/debian/patches/series xfree86-driver-synaptics-0.99.3/debian/patches/series --- xfree86-driver-synaptics-0.99.3/debian/patches/series +++ xfree86-driver-synaptics-0.99.3/debian/patches/series @@ -1,7 +1,7 @@ 01-synaptics-dont-grab-if-not-on-current-VT.patch 103_enable_cornertapping.patch 104_always_enable_tapping.patch -105_always_enable_multifinger_click.patch +105_correct_multifinger_click.patch 106_always_enable_vert_edge_scroll.patch 107_reduce_cursor_speed.patch 108_syndaemon_xinput_props.patch diff -u xfree86-driver-synaptics-0.99.3/debian/patches/107_reduce_cursor_speed.patch xfree86-driver-synaptics-0.99.3/debian/patches/107_reduce_cursor_speed.patch --- xfree86-driver-synaptics-0.99.3/debian/patches/107_reduce_cursor_speed.patch +++ xfree86-driver-synaptics-0.99.3/debian/patches/107_reduce_cursor_speed.patch @@ -8,7 +8,7 @@ - pars->min_speed = synSetFloatOption(opts, "MinSpeed", 0.4); - pars->max_speed = synSetFloatOption(opts, "MaxSpeed", 0.7); -+ pars->min_speed = synSetFloatOption(opts, "MinSpeed", 0.02); ++ pars->min_speed = synSetFloatOption(opts, "MinSpeed", 0.2); + pars->max_speed = synSetFloatOption(opts, "MaxSpeed", 0.5); pars->accl = synSetFloatOption(opts, "AccelFactor", accelFactor); pars->trackstick_speed = synSetFloatOption(opts, "TrackstickSpeed", 40); reverted: --- xfree86-driver-synaptics-0.99.3/debian/patches/105_always_enable_multifinger_click.patch +++ xfree86-driver-synaptics-0.99.3.orig/debian/patches/105_always_enable_multifinger_click.patch @@ -1,19 +0,0 @@ -Index: xserver-xorg-input-synaptics/src/synaptics.c -=================================================================== ---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-01-26 09:52:27.000000000 +0200 -+++ xserver-xorg-input-synaptics/src/synaptics.c 2009-01-26 09:52:44.000000000 +0200 -@@ -408,11 +408,10 @@ - tapButton2 = 2; - tapButton3 = 3; - -- /* Enable multifinger-click if we don't have right/middle button, -- otherwise clickFinger is always button 1. */ -+ /* Enable multifinger-click */ - clickFinger1 = 1; -- clickFinger2 = priv->has_right ? 1 : 3; -- clickFinger3 = priv->has_middle ? 1 : 2; -+ clickFinger2 = 2; -+ clickFinger3 = 3; - - /* Enable vert edge scroll if we can't detect doubletap */ - vertEdgeScroll = priv->has_double ? FALSE : TRUE; only in patch2: unchanged: --- xfree86-driver-synaptics-0.99.3.orig/debian/patches/105_correct_multifinger_click.patch +++ xfree86-driver-synaptics-0.99.3/debian/patches/105_correct_multifinger_click.patch @@ -0,0 +1,14 @@ +diff -Nur xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c xfree86-driver-synaptics-0.99.3/src/synaptics.c +--- xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c 2008-12-15 00:33:15.000000000 +0100 ++++ xfree86-driver-synaptics-0.99.3/src/synaptics.c 2009-01-31 18:40:37.000000000 +0100 +@@ -411,8 +411,8 @@ + /* Enable multifinger-click if we don't have right/middle button, + otherwise clickFinger is always button 1. */ + clickFinger1 = 1; +- clickFinger2 = priv->has_right ? 1 : 3; +- clickFinger3 = priv->has_middle ? 1 : 2; ++ clickFinger2 = priv->has_right ? 1 : 2; ++ clickFinger3 = priv->has_middle ? 1 : 3; + + /* Enable vert edge scroll if we can't detect doubletap */ + vertEdgeScroll = priv->has_double ? FALSE : TRUE;