debian/changelog                      |   17 +++++++++++++++--
 debian/local/51-synaptics-quirks.conf |   10 +++++++++-
 debian/local/66-xorg-synaptics.rules  |    1 +
 3 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit e1dbc23ec6aaa6f5fac396bf8468f42fd8daa3bf
Author: Christopher James Halse Rogers <[email protected]>
Date:   Tue Sep 14 14:17:06 2010 +1000

    Merge in -ubuntu2 & -ubuntu3 changes from outside git

diff --git a/debian/changelog b/debian/changelog
index 4a6122c..c7d0696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,23 @@
-xserver-xorg-input-synaptics (1.2.2-2ubuntu2) maverick; urgency=low
-
+xserver-xorg-input-synaptics (1.2.2-2ubuntu4) maverick; urgency=low
+   
   * Prevent non-evdev devices from firing the eventcomm AutoDevProbe callback
     (LP: #624985)
     - Add 115_evdev_only.patch
 
  -- Chase Douglas <[email protected]>  Wed, 01 Sep 2010 15:01:28 -0400
+  
+xserver-xorg-input-synaptics (1.2.2-2ubuntu3) maverick; urgency=low
+
+  * Rebuild against new Xserver 1.9 ABI
+
+ -- Christopher James Halse Rogers <[email protected]>  Mon, 09 Aug 2010 
21:47:56 +1000
+
+xserver-xorg-input-synaptics (1.2.2-2ubuntu2) maverick; urgency=low
+
+  * 51-synaptics-quirks.conf, 66-xorg-synaptics.rules:
+    - Put back quirk for Inspiron 1120 which was probably lost in a merge.
+
+ -- Alberto Milone <[email protected]>  Fri, 06 Aug 2010 12:26:59 
+0200
 
 xserver-xorg-input-synaptics (1.2.2-2ubuntu1) maverick; urgency=low
 
diff --git a/debian/local/51-synaptics-quirks.conf 
b/debian/local/51-synaptics-quirks.conf
index dde6b64..416045e 100644
--- a/debian/local/51-synaptics-quirks.conf
+++ b/debian/local/51-synaptics-quirks.conf
@@ -1,5 +1,5 @@
 Section "InputClass"
-       Identifier "Dell Inspiron quirks"
+       Identifier "Dell Inspiron embedded buttons quirks"
        MatchTag "inspiron_1011|inspiron_1012"
        MatchDevicePath "/dev/input/event*"
        Driver "synaptics"
@@ -8,6 +8,14 @@ Section "InputClass"
 EndSection
 
 Section "InputClass"
+       Identifier "Dell Inspiron quirks"
+       MatchTag "inspiron_1120"
+       MatchDevicePath "/dev/input/event*"
+       Driver "synaptics"
+       Option "JumpyCursorThreshold" "250"
+EndSection
+
+Section "InputClass"
        Identifier "HP Mininote quirks"
        MatchTag "mininote_1000"
        MatchDevicePath "/dev/input/event*"
diff --git a/debian/local/66-xorg-synaptics.rules 
b/debian/local/66-xorg-synaptics.rules
index 1b1ea57..1ce8981 100644
--- a/debian/local/66-xorg-synaptics.rules
+++ b/debian/local/66-xorg-synaptics.rules
@@ -7,6 +7,7 @@ ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end"
 # 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"


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to