Merge lp:~tjaalton/acpi-support/quantal into lp:acpi-support

Proposed by Timo Aaltonen on 2012-09-13
Status: Merged
Merged at revision: 207
Proposed branch: lp:~tjaalton/acpi-support/quantal
Merge into: lp:acpi-support
Diff against target: 37 lines (+6/-7)
2 files modified
asus-touchpad.sh (+2/-7)
debian/changelog (+4/-0)
To merge this branch: bzr merge lp:~tjaalton/acpi-support/quantal
Reviewer Review Type Date Requested Status
Steve Langasek 2012-09-13 Pending
Review via email: mp+124201@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'asus-touchpad.sh'
2--- asus-touchpad.sh 2012-03-13 16:01:01 +0000
3+++ asus-touchpad.sh 2012-09-13 13:39:12 +0000
4@@ -11,14 +11,9 @@
5 xinput list | sed -nr "s|.*$1.*id=([0-9]+).*|\1|p"
6 }
7
8-ENABLEPROP="Synaptics Off"
9+ENABLEPROP="Device Enabled"
10 # Get the xinput device number and enabling property for the touchpad
11-XINPUTNUM=$(getTouchDeviceId "SynPS/2 Synaptics TouchPad")
12-
13-if [ -z "$XINPUTNUM" ]; then
14- XINPUTNUM=$(getTouchDeviceId "PS/2 Elantech Touchpad")
15- ENABLEPROP="Device Enabled"
16-fi
17+XINPUTNUM=$(getTouchDeviceId "PS/2 Elantech Touchpad")
18
19 # if we failed to get an input, exit
20 [ -z "$XINPUTNUM" ] && exit 1
21
22=== modified file 'debian/changelog'
23--- debian/changelog 2012-03-16 06:42:46 +0000
24+++ debian/changelog 2012-09-13 13:39:12 +0000
25@@ -1,8 +1,12 @@
26 acpi-support (0.141) UNRELEASED; urgency=low
27
28+ [ Steve Langasek ]
29 * drop asus-brightness-{up,down} handlers and asus-brn-{down,up} scripts.
30 LP: #955176.
31
32+ [ Timo Aaltonen ]
33+ * asus-touchpad.sh: Don't handle Synaptics devices. (LP: #804109)
34+
35 -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 15 Mar 2012 17:10:11 -0700
36
37 acpi-support (0.140) precise; urgency=low

Subscribers

People subscribed via source and target branches