xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog | 11 ++++
debian/patches/130_dont_enable_rightbutton_area.patch | 43 ------------------
debian/patches/series | 1
3 files changed, 10 insertions(+), 45 deletions(-)
New commits:
commit c171d9e40005b79557b2402132f07f3ec2c71848
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Jun 7 10:07:57 2012 -0700
releasing version 1.6.1-1ubuntu2
diff --git a/debian/changelog b/debian/changelog
index 4bb62b4..0003c44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-synaptics (1.6.1-1ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.6.1-1ubuntu2) quantal-proposed; urgency=low
* Enable right button clickpad area by default (LP: #972727)
- Upstream has this enabled. We had it disabled for Precise due to the
feature landing well after feature freeze. This change puts us back in
sync with upstream.
- -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 07 Jun 2012 10:03:04 -0700
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 07 Jun 2012 10:07:18 -0700
xserver-xorg-input-synaptics (1.6.1-1ubuntu1) quantal; urgency=low
commit 3054a6872df2726887429b3bb3a6c4608315801f
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Jun 7 10:07:14 2012 -0700
Enable right button clickpad area by default (LP: #972727)
* Enable right button clickpad area by default (LP: #972727)
- Upstream has this enabled. We had it disabled for Precise due to the
feature landing well after feature freeze. This change puts us back in
sync with upstream.
diff --git a/debian/changelog b/debian/changelog
index 22b9efc..4bb62b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-input-synaptics (1.6.1-1ubuntu2) UNRELEASED; urgency=low
+
+ * Enable right button clickpad area by default (LP: #972727)
+ - Upstream has this enabled. We had it disabled for Precise due to the
+ feature landing well after feature freeze. This change puts us back in
+ sync with upstream.
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 07 Jun 2012 10:03:04 -0700
+
xserver-xorg-input-synaptics (1.6.1-1ubuntu1) quantal; urgency=low
* Merged from Debian unstable
diff --git a/debian/patches/130_dont_enable_rightbutton_area.patch b/debian/patches/130_dont_enable_rightbutton_area.patch
deleted file mode 100644
index b8399e1..0000000
--- a/debian/patches/130_dont_enable_rightbutton_area.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 797e51a27f48a93da9f3fb3355ca78c483029e63 Mon Sep 17 00:00:00 2001
-From: Chase Douglas <chase.douglas@canonical.com>
-Date: Fri, 23 Mar 2012 10:58:52 -0700
-Subject: [PATCH] Revert "conf: enable right-button click by default on
- non-Apple clickpads"
-
-This is a behavior change that is inappropriate at this point in the
-Precise release cycle
-
-This reverts commit b6779458bcdb049480310ba1acb3991ad061ffc7.
----
- conf/50-synaptics.conf | 18 ------------------
- 1 files changed, 0 insertions(+), 18 deletions(-)
-
-diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf
-index 822f7a4..5ec7e78 100644
---- a/conf/50-synaptics.conf
-+++ b/conf/50-synaptics.conf
-@@ -24,21 +24,3 @@ Section "InputClass"
- MatchDevicePath "/dev/input/mouse*"
- Option "Ignore" "on"
- EndSection
--
--# This option enables the bottom right corner to be a right button on
--# non-synaptics clickpads.
--# This option is only interpreted by clickpads.
--Section "InputClass"
-- Identifier "Default clickpad buttons"
-- MatchDriver "synaptics"
-- Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0"
--EndSection
--
--# This option disables software buttons on Apple touchpads.
--# This option is only interpreted by clickpads.
--Section "InputClass"
-- Identifier "Disable clickpad buttons on Apple touchpads"
-- MatchProduct "Apple|bcm5974"
-- MatchDriver "synaptics"
-- Option "SoftButtonAreas" "0 0 0 0 0 0 0 0"
--EndSection
---
-1.7.9.1
-
diff --git a/debian/patches/series b/debian/patches/series
index e6446d1..5a85917 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,7 +19,6 @@
126_ubuntu_xi22.patch
128_disable_three_click_action.patch
129_disable_three_touch_tap.patch
-130_dont_enable_rightbutton_area.patch
# in synaptics-1.6-branch, scheduled for 1.6.2 release
201-Avoid-out-of-bounds-access-by-running-num_active_tou.patch
commit 4f2482fa2c073e1248100d1eaf93460b1792e7b4
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Jun 7 10:01:29 2012 -0700
Sync with 1.6.1-1ubuntu1 upload
diff --git a/debian/changelog b/debian/changelog
index a2d032e..22b9efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.6.1-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.6.1-1ubuntu1) quantal; urgency=low
* Merged from Debian unstable
* Refreshed patches for indentation changes
Reply to: