debian/changelog | 7 +++++++ debian/local/51-synaptics-quirks.conf | 6 +++--- debian/local/66-xorg-synaptics.rules | 13 ------------- debian/rules | 2 ++ 4 files changed, 12 insertions(+), 16 deletions(-)
New commits: commit f1fd1ef4b18a4b2f94c0355154c5acad6c506a38 Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Thu Sep 29 21:01:27 2011 +0300 rules: Really install the quirks file, and migrate to using MatchProduct on it. diff --git a/debian/changelog b/debian/changelog index cb92e8c..2e0e4bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-synaptics (1.4.1-1ubuntu2) UNRELEASED; urgency=low + + * rules: Really install the quirks file, and migrate to using + MatchProduct on it. + + -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 29 Sep 2011 20:59:07 +0300 + xserver-xorg-input-synaptics (1.4.1-1ubuntu1) oneiric; urgency=low * Merge from Debian unstable, remaining changes: diff --git a/debian/local/51-synaptics-quirks.conf b/debian/local/51-synaptics-quirks.conf index 416045e..e88a996 100644 --- a/debian/local/51-synaptics-quirks.conf +++ b/debian/local/51-synaptics-quirks.conf @@ -1,6 +1,6 @@ Section "InputClass" Identifier "Dell Inspiron embedded buttons quirks" - MatchTag "inspiron_1011|inspiron_1012" + MatchProduct "Inspiron 1011|Inspiron 1012" MatchDevicePath "/dev/input/event*" Driver "synaptics" Option "JumpyCursorThreshold" "90" @@ -9,7 +9,7 @@ EndSection Section "InputClass" Identifier "Dell Inspiron quirks" - MatchTag "inspiron_1120" + MatchProduct "Inspiron 1120" MatchDevicePath "/dev/input/event*" Driver "synaptics" Option "JumpyCursorThreshold" "250" @@ -17,7 +17,7 @@ EndSection Section "InputClass" Identifier "HP Mininote quirks" - MatchTag "mininote_1000" + MatchProduct "HP Mininote 1000" MatchDevicePath "/dev/input/event*" Driver "synaptics" Option "JumpyCursorThreshold" "20" diff --git a/debian/local/66-xorg-synaptics.rules b/debian/local/66-xorg-synaptics.rules deleted file mode 100644 index 1ce8981..0000000 --- a/debian/local/66-xorg-synaptics.rules +++ /dev/null @@ -1,13 +0,0 @@ -ACTION!="add|change", GOTO="xorg_synaptics_end" -KERNEL!="event*", GOTO="xorg_synaptics_end" - -ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end" - -# Placeholder for platform specific quirks needing -# ID_INPUT.tags to be set. -ATTR{[dmi/id]product_name}=="Inspiron 1011", ENV{ID_INPUT.tags}="inspiron_1011" -ATTR{[dmi/id]product_name}=="Inspiron 1012", ENV{ID_INPUT.tags}="inspiron_1012" -ATTR{[dmi/id]product_name}=="Inspiron 1120", ENV{ID_INPUT.tags}="inspiron_1120" -ATTR{[dmi/id]product_name}=="HP MiniNote 1000", ENV{ID_INPUT.tags}="mininote_1000" - -LABEL="xorg_synaptics_end" diff --git a/debian/rules b/debian/rules index 3d192dc..d530761 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,8 @@ override_dh_auto_install: override_dh_install: find debian/tmp -name '*.la' -delete dh_install --fail-missing + install -d debian/xserver-xorg-input-synaptics/usr/share/X11/xorg.conf.d + install -m 644 debian/local/51-synaptics-quirks.conf debian/xserver-xorg-input-synaptics/usr/share/X11/xorg.conf.d # That's a plugin, use appropriate warning level: override_dh_shlibdeps: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1r9kvw-0001lz...@vasks.debian.org