xserver-xorg-input-synaptics: Changes to 'ubuntu'
Rebased ref, commits from common ancestor:
commit 5062cc44b778c86f42cbb689568fb930ab212d6d
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 4 14:42:44 2012 -0700
releasing version 1.5.99.902-0ubuntu3
diff --git a/debian/changelog b/debian/changelog
index 91d4096..bf9ba02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-input-synaptics (1.5.99.902-0ubuntu3) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.5.99.902-0ubuntu3) precise; urgency=low
* Fix bad default for two touch tap as middle button click (LP: #973783)
- Fixed 104_always_enable_tapping.patch
- Refreshed 129_disable_three_touch_tap.patch
- -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 04 Apr 2012 14:36:25 -0700
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 04 Apr 2012 14:42:34 -0700
xserver-xorg-input-synaptics (1.5.99.902-0ubuntu2) precise; urgency=low
commit 3497fda33268c0d9696fbaaab5ed627f250295f0
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 4 14:41:14 2012 -0700
Fix bad default for two touch tap as middle button click (LP: #973783)
* Fix bad default for two touch tap as middle button click (LP: #973783)
- Fixed 104_always_enable_tapping.patch
- Refreshed 129_disable_three_touch_tap.patch
diff --git a/debian/changelog b/debian/changelog
index 80237c3..91d4096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-synaptics (1.5.99.902-0ubuntu3) UNRELEASED; urgency=low
+
+ * Fix bad default for two touch tap as middle button click (LP: #973783)
+ - Fixed 104_always_enable_tapping.patch
+ - Refreshed 129_disable_three_touch_tap.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 04 Apr 2012 14:36:25 -0700
+
xserver-xorg-input-synaptics (1.5.99.902-0ubuntu2) precise; urgency=low
* Fix three touch taps and clicks on some trackpads (LP: #971783)
diff --git a/debian/patches/104_always_enable_tapping.patch b/debian/patches/104_always_enable_tapping.patch
index 8a19527..c8e2209 100644
--- a/debian/patches/104_always_enable_tapping.patch
+++ b/debian/patches/104_always_enable_tapping.patch
@@ -1,8 +1,8 @@
Index: xserver-xorg-input-synaptics/src/synaptics.c
===================================================================
---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:54:45.481347675 +0300
-+++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:54:48.311347674 +0300
-@@ -488,10 +488,10 @@
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2012-04-04 14:35:24.964138002 -0700
++++ xserver-xorg-input-synaptics/src/synaptics.c 2012-04-04 14:35:41.240138001 -0700
+@@ -656,10 +656,10 @@ static void set_default_parameters(Input
palmMinWidth = priv->minw + range * (10.0/16);
emulateTwoFingerMinW = priv->minw + range * (7.0/16);
@@ -12,8 +12,8 @@ Index: xserver-xorg-input-synaptics/src/synaptics.c
- tapButton3 = priv->has_left ? 0 : 2;
+ /* Enable tap */
+ tapButton1 = 1;
-+ tapButton2 = 2;
-+ tapButton3 = 3;
++ tapButton2 = 3;
++ tapButton3 = 2;
/* Enable multifinger-click if only have one physical button,
otherwise clickFinger is always button 1. */
diff --git a/debian/patches/129_disable_three_touch_tap.patch b/debian/patches/129_disable_three_touch_tap.patch
index 2c69473..02ca9b9 100644
--- a/debian/patches/129_disable_three_touch_tap.patch
+++ b/debian/patches/129_disable_three_touch_tap.patch
@@ -3,8 +3,8 @@
@@ -633,7 +633,7 @@ static void set_default_parameters(Input
/* Enable tap */
tapButton1 = 1;
- tapButton2 = 2;
-- tapButton3 = 3;
+ tapButton2 = 3;
+- tapButton3 = 2;
+ tapButton3 = 0; /* Disabled by default so three-touch gestures work */
/* Enable multifinger-click if only have one physical button,
Reply to: