Merge ~mkukri/ubuntu/+source/xserver-xorg-input-synaptics:merge into ubuntu/+source/xserver-xorg-input-synaptics:debian/sid

[Mate Kukri]

ubuntu1 FTBFS-d, but it seems to be because the uploaded .diff.gz didn't include some files. Anyone uploading, please make sure the output is like the first snippet, and that the resulting .diff.gz has those files.

I know the Debian .diff.gz shouldn't really modify upstream files, but the upstream git repo and tarball is not perfectly identical, and Debian does the same thing.

See a successful PPA testbuild here: https://launchpad.net/~mkukri/+archive/ubuntu/dev/+build/27035982

I locally get the following dpkg-buildpackage output (similar result to the Debian version):

```
dpkg-source: warning: the diff modifies the following upstream files:
 .gitlab-ci.yml
 ChangeLog
 autogen.sh
 docs/README.alps
 docs/tapndrag.dia
 docs/trouble-shooting.txt
```

Vs from launchpad build log it seems to show that only the gitlab-ci.yml was there:

```
dpkg-source: info: upstream files that have been modified:
 /<<PKGBUILDDIR>>/.gitlab-ci.yml
```

[Dan Bungert (dbungert)]

Hi Mate, thanks for the MP.

I see the changelog says "No change rebuild" but what's going on here is something different. If I diff the actual 1.9.2-1ubuntu1 version to this, it does show differences similar to what is shown in your change description. So this isn't a "No change rebuild" - if you debdiff source package for such an upload I would only expect a difference on debian/changelog. So the changelog should instead reflect that. What's going on here is a correction to a previous flawed upload, which is fine but should be noted in the debian/changelog file. What that should be really depends on the rest of what's going on.

> I know the Debian .diff.gz shouldn't really modify upstream files,
> but the upstream git repo and tarball is not perfectly identical,

Source repacking is a thing and intended for some problems of this sort, for instance if the upstream tarball has things that are believed to be non-distributable. Is that the case here?

> and Debian does the same thing.

It really would be more common to patch these files instead of modifying them directly, even if the Debian version were to be doing it in a non-standard way. Is there a reason we can't patch these files here in the quilt flow?

review: Needs Fixing

[Mate Kukri (mkukri)]

Hi Dan, thanks for the review.

> I see the changelog says "No change rebuild" but what's going on here is
> something different. If I diff the actual 1.9.2-1ubuntu1 version to this, it
> does show differences similar to what is shown in your change description. So
> this isn't a "No change rebuild" - if you debdiff source package for such an
> upload I would only expect a difference on debian/changelog. So the changelog
> should instead reflect that. What's going on here is a correction to a
> previous flawed upload, which is fine but should be noted in the
> debian/changelog file. What that should be really depends on the rest of
> what's going on.

As for as changelog goes, of course I'll go and fix that. I put that there because it was a no change rebuild on my machine, but in retrospect that is indeed wrong because the source package that was uploaded did not match my build of ubuntu1.

> > I know the Debian .diff.gz shouldn't really modify upstream files,
> > but the upstream git repo and tarball is not perfectly identical,
>
> Source repacking is a thing and intended for some problems of this sort, for
> instance if the upstream tarball has things that are believed to be non-
> distributable. Is that the case here?

What is going on is that the upstream git repository has extra files compared to the upstream tarball,
and these "modifications" are merely adding those to the files from the tarball (because of the packaging actually being based on upstream git).

This seems to be limited to "autogen.sh" and some extra README files. All of which appear to be under the same license as the rest of the package.

> > and Debian does the same thing.
>
> It really would be more common to patch these files instead of modifying them
> directly, even if the Debian version were to be doing it in a non-standard
> way. Is there a reason we can't patch these files here in the quilt flow?

I can do this if you prefer, however the packaging is based on the upstream git repository, so it would imply extra diff removing the files and adding patches, and diverging from Debian for what appears to me not much benefit in this case.

Unmerged commits

e5f3dea... by Mate Kukri on 2023-12-01

releasing package xserver-xorg-input-synaptics version 1.9.2-1ubuntu2

4abf83d... by Mate Kukri on 2023-11-27

update-maintainer

d5d6613... by Mate Kukri on 2023-11-27

reconstruct-changelog

e451cd3... by Mate Kukri on 2023-11-27

merge-changelogs

c12b4d4... by Mate Kukri on 2023-11-27

    - debian/patches/129_disable_three_touch_tap.patch: Disable three touch tap in favor of uTouch gestures.

9dd47ce... by Mate Kukri on 2023-11-27

    - debian/patches/128_disable_three_click_action.patch: Disable three touch click in favor of uTouch gestures.

2dec851... by Mate Kukri on 2023-11-27

    - debian/patches/124_syndaemon_events.patch: Drain spurious events from XRecord connection as a work around for a buggy

a13b33e... by Mate Kukri on 2023-11-27

    - debian/patches/118_quell_error_msg.patch: Don't print error "Unable to find a synaptics device" when used on system

421e293... by Mate Kukri on 2023-11-27

    - debian/patches/115_evdev_only.patch: Prevent non-evdev devices from firing the eventcomm AutoDevProbe callback.

118afda... by Mate Kukri on 2023-11-27

    - debian/patches/106_always_enable_vert_edge_scroll.patch: Enable vertical edge tapping by default even if we enable two-finger

diff --git a/debian/changelog b/debian/changelog
index 9fca8a6..63f4359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+xserver-xorg-input-synaptics (1.9.2-1ubuntu2) noble; urgency=medium
+
+  * Re-upload to cause FTBFS caused by missing files in `1.9.2-1ubuntu1`
+
+ -- Mate Kukri <[e-mail]>  Fri, 01 Dec 2023 10:11:30 +0000
+
+xserver-xorg-input-synaptics (1.9.2-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/gbp.conf: Point at Ubuntu branch.
+    - debian/xserver-xorg-input-synaptics.install: Install quirks
+    - debian/local/51-synaptics-quirks.conf: Add quirks for Dell Inspiron, HP Mininote.
+    - debian/local/66-xorg-synaptics.rules: Udev rules to tag Dell Inspiron, HP Mininote for quirks.
+    - debian/patches/101_resolution_detect_option.patch: Provide an option to prevent synaptics from communicating the
+    - debian/patches/103_enable_cornertapping.patch: Enable right/middle clicks by tapping in the bottom- and top-right
+    - debian/patches/104_always_enable_tapping.patch: Enable tapping even when a physical left button is available.
+    - debian/patches/106_always_enable_vert_edge_scroll.patch: Enable vertical edge tapping by default even if we enable two-finger
+    - debian/patches/115_evdev_only.patch: Prevent non-evdev devices from firing the eventcomm AutoDevProbe callback.
+    - debian/patches/118_quell_error_msg.patch: Don't print error "Unable to find a synaptics device" when used on system
+    - debian/patches/124_syndaemon_events.patch: Drain spurious events from XRecord connection as a work around for a buggy
+    - debian/patches/128_disable_three_click_action.patch: Disable three touch click in favor of uTouch gestures.
+    - debian/patches/129_disable_three_touch_tap.patch: Disable three touch tap in favor of uTouch gestures.
+
+ -- Mate Kukri <[e-mail]>  Mon, 27 Nov 2023 16:21:06 +0000
+
 xserver-xorg-input-synaptics (1.9.2-1) unstable; urgency=medium
 
   [ Debian Janitor ]
@@ -25,6 +50,26 @@ xserver-xorg-input-synaptics (1.9.1-2) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Mon, 06 Apr 2020 14:13:14 +0300
 
+xserver-xorg-input-synaptics (1.9.1-1ubuntu3) focal; urgency=medium
+
+  * Revert the previous change but fix the build by restoring files from
+    Debian which were removed due to a merge error
+
+ -- Sebastien Bacher <[e-mail]>  Mon, 06 Apr 2020 13:14:41 +0200
+
+xserver-xorg-input-synaptics (1.9.1-1ubuntu2) focal; urgency=medium
+
+  * debian/xserver-xorg-input-synaptics.docs:
+    - don't list non existing files, fixes the build
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 03 Apr 2020 21:29:50 +0200
+
+xserver-xorg-input-synaptics (1.9.1-1ubuntu1) cosmic; urgency=medium
+
+  * Resynchronize on Debian
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 24 Aug 2018 13:29:09 +0200
+
 xserver-xorg-input-synaptics (1.9.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -34,6 +79,12 @@ xserver-xorg-input-synaptics (1.9.1-1) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Thu, 23 Aug 2018 16:18:23 +0300
 
+xserver-xorg-input-synaptics (1.9.0-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <[e-mail]>  Tue, 07 Mar 2017 12:30:57 +0200
+
 xserver-xorg-input-synaptics (1.9.0-1) unstable; urgency=medium
 
   [ Andreas Boll ]
@@ -56,12 +107,98 @@ xserver-xorg-input-synaptics (1.8.3-2) unstable; urgency=medium
 
  -- Emilio Pozuelo Monfort <[e-mail]>  Thu, 26 May 2016 18:32:56 +0200
 
+xserver-xorg-input-synaptics (1.8.3-1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian, remaining Ubuntu changes:
+  * debian/gbp.conf:
+    - Point at Ubuntu branch.
+  * debian/local/51-synaptics-quirks.conf:
+    - Add quirks for Dell Inspiron, HP Mininote.
+  * debian/local/66-xorg-synaptics.rules:
+    - Udev rules to tag Dell Inspiron, HP Mininote for quirks.
+  * debian/xserver-xorg-input-synaptics.install:
+    - Install quirks
+  * debian/patches/101_resolution_detect_option.patch:
+    - Provide an option to prevent synaptics from communicating the
+      touchpad size to the xserver.
+  * debian/patches/103_enable_cornertapping.patch:
+    - Enable right/middle clicks by tapping in the bottom- and top-right
+      corners.
+  * debian/patches/104_always_enable_tapping.patch:
+    - Enable tapping even when a physical left button is available.
+  * debian/patches/106_always_enable_vert_edge_scroll.patch:
+    - Enable vertical edge tapping by default even if we enable two-finger
+      scrolling as well.
+  * debian/patches/115_evdev_only.patch:
+    - Prevent non-evdev devices from firing the eventcomm AutoDevProbe callback.
+  * debian/patches/118_quell_error_msg.patch:
+    - Don't print error "Unable to find a synaptics device" when used on system
+      that doesn't have a touchpad anyway.
+  * debian/patches/124_syndaemon_events.patch:
+    - Drain spurious events from XRecord connection as a work around for a buggy
+      X server.
+  * debian/patches/128_disable_three_click_action.patch:
+    - Disable three touch click in favor of uTouch gestures.
+  * debian/patches/129_disable_three_touch_tap.patch:
+    - Disable three touch tap in favor of uTouch gestures.
+
+ -- Robert Ancell <[e-mail]>  Wed, 25 May 2016 11:32:52 +1200
+
 xserver-xorg-input-synaptics (1.8.3-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Julien Cristau <[e-mail]>  Sun, 24 Jan 2016 14:31:57 +0100
 
+xserver-xorg-input-synaptics (1.8.2-1ubuntu3) xenial; urgency=medium
+
+  * Really rebuild against new xserver.
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 03 Mar 2016 15:36:59 +0200
+
+xserver-xorg-input-synaptics (1.8.2-1ubuntu2) xenial; urgency=medium
+
+  * Rebuild against new xserver ABI.
+
+ -- Timo Aaltonen <[e-mail]>  Mon, 18 Jan 2016 16:00:22 +0200
+
+xserver-xorg-input-synaptics (1.8.2-1ubuntu1) wily; urgency=medium
+
+  * Merge with Debian, remaining Ubuntu changes:
+  * debian/gbp.conf:
+    - Point at Ubuntu branch.
+  * debian/local/51-synaptics-quirks.conf:
+    - Add quirks for Dell Inspiron, HP Mininote.
+  * debian/local/66-xorg-synaptics.rules:
+    - Udev rules to tag Dell Inspiron, HP Mininote for quirks.
+  * debian/xserver-xorg-input-synaptics.install:
+    - Install quirks
+  * debian/patches/101_resolution_detect_option.patch:
+    - Provide an option to prevent synaptics from communicating the
+      touchpad size to the xserver.
+  * debian/patches/103_enable_cornertapping.patch:
+    - Enable right/middle clicks by tapping in the bottom- and top-right
+      corners.
+  * debian/patches/104_always_enable_tapping.patch:
+    - Enable tapping even when a physical left button is available.
+  * debian/patches/106_always_enable_vert_edge_scroll.patch:
+    - Enable vertical edge tapping by default even if we enable two-finger
+      scrolling as well.
+  * debian/patches/115_evdev_only.patch:
+    - Prevent non-evdev devices from firing the eventcomm AutoDevProbe callback.
+  * debian/patches/118_quell_error_msg.patch:
+    - Don't print error "Unable to find a synaptics device" when used on system
+      that doesn't have a touchpad anyway.
+  * debian/patches/124_syndaemon_events.patch:
+    - Drain spurious events from XRecord connection as a work around for a buggy
+      X server.
+  * debian/patches/128_disable_three_click_action.patch:
+    - Disable three touch click in favor of uTouch gestures.
+  * debian/patches/129_disable_three_touch_tap.patch:
+    - Disable three touch tap in favor of uTouch gestures.
+
+ -- Robert Ancell <[e-mail]>  Tue, 14 Jul 2015 16:30:22 +1200
+
 xserver-xorg-input-synaptics (1.8.2-1) unstable; urgency=medium
 
   * Let uscan verify tarball signatures.
@@ -70,6 +207,16 @@ xserver-xorg-input-synaptics (1.8.2-1) unstable; urgency=medium
 
  -- Julien Cristau <[e-mail]>  Sun, 03 May 2015 10:17:33 +0200
 
+xserver-xorg-input-synaptics (1.8.1-1ubuntu1) utopic; urgency=medium
+
+  * Merge from released sid.
+  * Drop postinst file, only needed for updating from synaptics <= 1.4.1.
+  * Remaining changes:
+    - A bunch of behavioral patches.
+    - Install some behavioral quirks.
+
+ -- Maarten Lankhorst <[e-mail]>  Mon, 22 Sep 2014 09:44:47 +0200
+
 xserver-xorg-input-synaptics (1.8.1-1) unstable; urgency=medium
 
   * New upstream release
@@ -90,6 +237,26 @@ xserver-xorg-input-synaptics (1.8.0-1) unstable; urgency=medium
 
  -- maximilian attems <[e-mail]>  Sat, 12 Jul 2014 19:20:04 +0200
 
+xserver-xorg-input-synaptics (1.8.0-1~exp2ubuntu3) utopic; urgency=medium
+
+  * Rebuild for new xorg-server abi.
+
+ -- Maarten Lankhorst <[e-mail]>  Wed, 10 Sep 2014 16:29:27 +0200
+
+xserver-xorg-input-synaptics (1.8.0-1~exp2ubuntu2) utopic; urgency=medium
+
+  * Remerge from debian-experimental to pick up libxtst-dev.
+    - Fixes touchpad sometimes not disabling by allowing
+      'syndaemon -R' to use XRecord correctly. (LP: #1323006)
+
+ -- Maarten Lankhorst <[e-mail]>  Tue, 15 Jul 2014 15:07:15 +0200
+
+xserver-xorg-input-synaptics (1.8.0-1~exp2ubuntu1) utopic; urgency=medium
+
+  * Merge from debian-experimental.
+
+ -- Maarten Lankhorst <[e-mail]>  Wed, 02 Jul 2014 16:36:40 +0200
+
 xserver-xorg-input-synaptics (1.8.0-1~exp2) experimental; urgency=medium
 
   * Mark libevdev-dev build dependency [linux-any]. (closes: #749286)
@@ -110,6 +277,27 @@ xserver-xorg-input-synaptics (1.8.0-1~exp1) experimental; urgency=medium
 
  -- maximilian attems <[e-mail]>  Fri, 23 May 2014 18:27:28 +0200
 
+xserver-xorg-input-synaptics (1.7.99.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from unreleased debian-experimental. (LP: #1294515)
+
+ -- Maarten Lankhorst <[e-mail]>  Wed, 26 Mar 2014 10:02:42 +0100
+
+xserver-xorg-input-synaptics (1.7.3-1ubuntu1) trusty; urgency=low
+
+  * Merge from debian-unstable.
+  * Drop long disabled patches from the archive.
+    - 105_correct_multifinger_click.patch
+    - 116_xi2_1.patch
+    - 117_gestures.patch
+    - 119_active_area_touches.patch
+    - 120_active_touches_num_fingers.patch
+    - 121_semi-mt_num_fingers.patch
+    - 123_order_ProcessTouch_for_numFingers.patch  
+  * Fixes xserver 1.15 compatibility. (LP: #1276875)
+
+ -- Robert Hooker <[e-mail]>  Thu, 06 Feb 2014 11:11:26 -0500
+
 xserver-xorg-input-synaptics (1.7.3-1) unstable; urgency=medium
 
   [ Michele Cane ]
@@ -150,6 +338,26 @@ xserver-xorg-input-synaptics (1.7.1-1) unstable; urgency=low
 
  -- Julien Cristau <[e-mail]>  Thu, 05 Sep 2013 22:27:28 +0200
 
+xserver-xorg-input-synaptics (1.7.1-0ubuntu2) trusty; urgency=medium
+
+  * Rebuild for xorg 1.15 abi.
+
+ -- Maarten Lankhorst <[e-mail]>  Wed, 05 Feb 2014 09:40:08 +0000
+
+xserver-xorg-input-synaptics (1.7.1-0ubuntu1) saucy; urgency=low
+
+  * Merge from unreleased debian git.
+
+ -- Maarten Lankhorst <[e-mail]>  Thu, 25 Jul 2013 15:35:14 +0200
+
+xserver-xorg-input-synaptics (1.6.3-0ubuntu1.1) raring; urgency=low
+
+  * Merge from unreleased debian git.
+  * 130_reset-num_active_touches-on-deviceoff.patch, use-sigsafe-logging.patch:
+    Dropped, upstream.
+
+ -- Timo Aaltonen <[e-mail]>  Fri, 08 Feb 2013 13:40:38 +0200
+
 xserver-xorg-input-synaptics (1.6.2-2) unstable; urgency=low
 
   * Pull latest synaptics-1.6-branch:
@@ -158,12 +366,104 @@ xserver-xorg-input-synaptics (1.6.2-2) unstable; urgency=low
 
  -- Julien Cristau <[e-mail]>  Mon, 01 Oct 2012 21:55:06 +0200
 
+xserver-xorg-input-synaptics (1.6.2-1ubuntu6) raring; urgency=low
+
+  * use-sigsafe-logging.patch: Upstream commit from master, use signal
+    safe logging with input ABI 18. (LP: #1100586)
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 17 Jan 2013 10:46:59 +0200
+
+xserver-xorg-input-synaptics (1.6.2-1ubuntu5) quantal; urgency=low
+
+  * Added 130_reset-num_active_touches-on-deviceoff.patch (LP: #956071)
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 30 Aug 2012 20:13:39 +0300
+
+xserver-xorg-input-synaptics (1.6.2-1ubuntu4) quantal-proposed; urgency=low
+
+  [ Maarten Lankhorst ]
+  * Add -dbg package
+
+ -- Timo Aaltonen <[e-mail]>  Tue, 14 Aug 2012 19:10:16 +0300
+
+xserver-xorg-input-synaptics (1.6.2-1ubuntu3) quantal-proposed; urgency=low
+
+  * control: Bump the build-depends for new xserver.
+
+ -- Timo Aaltonen <[e-mail]>  Wed, 01 Aug 2012 14:27:06 +0300
+
+xserver-xorg-input-synaptics (1.6.2-1ubuntu2) quantal-proposed; urgency=low
+
+  * Removed patches:
+    - 125_option_rec_revert.patch
+    - 126_ubuntu_xi22.patch
+  * Bump xserver to 1.12 minimum
+
+ -- Maarten Lankhorst <[e-mail]>  Thu, 28 Jun 2012 21:49:46 +0200
+
+xserver-xorg-input-synaptics (1.6.2-1ubuntu1) quantal; urgency=low
+
+  * Merged from Debian unstable
+  * Removed patches that were cherry picked commits and now in 1.6.2:
+    - 201-Avoid-out-of-bounds-access-by-running-num_active_tou.patch
+    - 202-Ignore-pre-existing-touches.patch
+    - 203-Fix-coasting-for-negative-ScrollDelta.patch
+    - 204-Reset-open-slots-array-on-device-disable.patch
+    - 205-Reset-hw-x-y-to-INT_MIN-and-skip-HandleState-until-w.patch
+    - 206-Don-t-allow-for-scroll-distances-of-0-49965.patch
+  * Remaining patches:
+    - 101_resolution_detect_option.patch
+    - 103_enable_cornertapping.patch
+    - 104_always_enable_tapping.patch
+    - 106_always_enable_vert_edge_scroll.patch
+    - 115_evdev_only.patch
+    - 118_quell_error_msg.patch
+    - 124_syndaemon_events.patch
+    - 125_option_rec_revert.patch
+    - 126_ubuntu_xi22.patch
+    - 128_disable_three_click_action.patch
+    - 129_disable_three_touch_tap.patch
+
+ -- Maarten Lankhorst <[e-mail]>  Thu, 14 Jun 2012 09:35:21 +0200
+
 xserver-xorg-input-synaptics (1.6.2-1) unstable; urgency=low
 
   * New upstream release, from the 1.6 branch.
 
  -- Cyril Brulebois <[e-mail]>  Wed, 13 Jun 2012 22:22:42 +0200
 
+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 <[e-mail]>  Thu, 07 Jun 2012 10:07:18 -0700
+
+xserver-xorg-input-synaptics (1.6.1-1ubuntu1) quantal; urgency=low
+
+  * Merged from Debian unstable
+  * Refreshed patches for indentation changes
+    - 101_resolution_detect_option.patch
+    - 118_quell_error_msg.patch
+    - 124_syndaemon_events.patch
+    - 125_option_rec_revert.patch
+  * Add temporary patches, for upstream git commits on synaptics-1.6-branch
+  * Fix memory corruption by driver (LP: #941953) FDo #49439
+   - 201-Avoid-out-of-bounds-access-by-running-num_active_tou.patch
+   - 202-Ignore-pre-existing-touches.patch
+  * Fix FDo #49966
+   - 203-Fix-coasting-for-negative-ScrollDelta.patch
+  * Fix jumpy cursor after suspend/resume
+   - 204-Reset-open-slots-array-on-device-disable.patch
+  * Fix another resume bug
+   - 205-Reset-hw-x-y-to-INT_MIN-and-skip-HandleState-until-w.patch
+  * Fix division by 0 or infinite loop with zero scroll distance FDo #49965
+   - 206-Don-t-allow-for-scroll-distances-of-0-49965.patch
+
+ -- Maarten Lankhorst <[e-mail]>  Mon, 21 May 2012 14:14:49 +0200
+
 xserver-xorg-input-synaptics (1.6.1-1) unstable; urgency=low
 
   [ Julien Cristau ]
@@ -181,6 +481,22 @@ xserver-xorg-input-synaptics (1.6.0-1) unstable; urgency=low
 
  -- Cyril Brulebois <[e-mail]>  Mon, 07 May 2012 01:13:08 +0200
 
+xserver-xorg-input-synaptics (1.6.0-0ubuntu1) quantal; urgency=low
+
+  * Update to upstream version 1.6.0
+    - Bug fixes only
+    - Fully fixes touchpad bugs on suspend/resume (LP: #968845)
+  * Drop patches merged upstream
+    - 200_fix_four_tap.patch
+    - 201_fix_touch_count.patch
+    - 202_touch_record_bounds_check.patch
+    - 203_fix_coasting_speed.patch
+    - 204_monotonicise_hw_timestamp.patch
+    - 205_end_touches_on_disable.patch
+  * Refreshed 130_dont_enable_rightbutton_area.patch
+
+ -- Chase Douglas <[e-mail]>  Mon, 07 May 2012 12:22:23 -0700
+
 xserver-xorg-input-synaptics (1.5.99.904-2) unstable; urgency=low
 
   * Add a build-dep on libmtdev-dev now that X server 1.12 is in sid,
@@ -200,6 +516,66 @@ xserver-xorg-input-synaptics (1.5.99.902-1) unstable; urgency=low
 
  -- Cyril Brulebois <[e-mail]>  Mon, 02 Apr 2012 01:12:26 +0000
 
+xserver-xorg-input-synaptics (1.5.99.902-0ubuntu5.1) precise-proposed; urgency=low
+
+  * debian/patches/204_monotonicise_hw_timestamp.patch:
+    - Cherry-pick patch from upstream to ensure the timestamps used when
+      determining velocities are monotonic.  In certain circumstances the
+      timestamps from hardware events can be less than the timestamps
+      from the preceeding artificially-generated events.
+      + Fixes occasional huge jumps in pointer position.
+      + Fixes two-finger scrolling in GTK+3 windows (such as Nautilus and
+        Evolution) failing some time after login. (LP: #982771)
+  * debian/patches/205_end_touches_on_disable.patch:
+    - Upstream patch to reset touch state on device disable.
+      + Fixes touchpad not working after suspend on some MacBook models
+        (LP: #968845)
+
+ -- Christopher James Halse Rogers <[e-mail]>  Tue, 24 Apr 2012 14:32:49 +1000
+
+xserver-xorg-input-synaptics (1.5.99.902-0ubuntu5) precise-proposed; urgency=low
+
+  * Fix coasting speed on multitouch touchpads (LP: #930938)
+    - Add patch 203_fix_coasting_speed.patch
+
+ -- Chow Loong Jin <[e-mail]>  Fri, 13 Apr 2012 16:14:04 +0800
+
+xserver-xorg-input-synaptics (1.5.99.902-0ubuntu4) precise; urgency=low
+
+  * Fix crash on Apple trackpads when touching with more than 10 fingers
+    (LP: #974017)
+    - Add temporary patch 202_touch_record_bounds_check.patch
+
+ -- Chase Douglas <[e-mail]>  Mon, 09 Apr 2012 11:44:26 -0700
+
+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 <[e-mail]>  Wed, 04 Apr 2012 14:42:34 -0700
+
+xserver-xorg-input-synaptics (1.5.99.902-0ubuntu2) precise; urgency=low
+
+  * Fix three touch taps and clicks on some trackpads (LP: #971783)
+    - Add temporary patch 201_fix_touch_count.patch
+
+ -- Chase Douglas <[e-mail]>  Mon, 02 Apr 2012 11:33:58 -0700
+
+xserver-xorg-input-synaptics (1.5.99.902-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+  * Drop patches merged upstream
+    - 200_fix_clickfinger_non-clickpads.patch
+    - 201_fix_clickfinger_clickpad_actions.patch
+  * Revert upstream behavior change: enabling right button area by default
+    - Too late to enable in Precise
+  * Fix erroneous tap actions on four-touch tap (LP: #963327)
+    - Add temporary patch 200_fix_four_tap.patch
+
+ -- Chase Douglas <[e-mail]>  Thu, 29 Mar 2012 15:31:40 -0700
+
 xserver-xorg-input-synaptics (1.5.99.901-1) unstable; urgency=low
 
   * New upstream release candidate (1.6 RC1):
@@ -208,6 +584,136 @@ xserver-xorg-input-synaptics (1.5.99.901-1) unstable; urgency=low
 
  -- Cyril Brulebois <[e-mail]>  Tue, 20 Mar 2012 21:40:10 +0000
 
+xserver-xorg-input-synaptics (1.5.99.901-0ubuntu2) precise; urgency=low
+
+  * Disable three touch tap in favor of uTouch gestures (LP: #961725)
+    - See
+      https://lists.ubuntu.com/archives/ubuntu-desktop/2012-February/003694.html
+      for details.
+    - Add 129_disable_three_touch_tap.patch
+  * Fix click actions for non-clickpad touchpads (LP: #960108)
+    - Add temporary patch 200_fix_clickfinger_non-clickpads.patch
+  * Fix click action finger count calculation (LP: #961738)
+    - Add temporary patch 201_fix_clickfinger_clickpad_actions.patch
+
+ -- Chase Douglas <[e-mail]>  Wed, 21 Mar 2012 16:00:26 -0700
+
+xserver-xorg-input-synaptics (1.5.99.901-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+    - Includes ClickPad support
+    - Fixes ClickPad click action interference
+    - Re-enables ClickPad support by default (LP: #955404)
+    - Everything else is bug fixes
+  * Remove 129_clickpad.patch, it has been merged upstream
+  * Bump lintian standards to 3.9.3
+
+ -- Chase Douglas <[e-mail]>  Thu, 15 Mar 2012 17:58:09 -0700
+
+xserver-xorg-input-synaptics (1.5.99~git20120223-0ubuntu2) precise; urgency=low
+
+  * Disable ClickPad support when there is no physical right button
+    (LP: #941046)
+    - This re-enables click actions, which was enabled by default previously
+    - Users can enable ClickPad support through xorg.conf, xinput, or synclient
+    - See
+      https://lists.ubuntu.com/archives/ubuntu-desktop/2012-February/003751.html
+      for the discussion guiding this change.
+  * Refresh ClickPad support patch with changes from upstream review
+    - No new functionality
+  * Remove bottom area mask for Dell netbook clickpads with two buttons
+
+ -- Chase Douglas <[e-mail]>  Fri, 02 Mar 2012 13:33:26 -0700
+
+xserver-xorg-input-synaptics (1.5.99~git20120223-0ubuntu1) precise; urgency=low
+
+  * Update to latest code in git (0a2fd56)
+    - Only includes bug fixes
+  * Drop temporary patches that have been merged upstream:
+    - 129_tmp_pointer_drift.patch
+    - 130_tmp_touch_count_fix.patch
+  * Revert tap-and-drag locking default change (LP: #934770)
+    - Drop 127_default_drag_lock.patch
+  * Add ClickPad support (LP: #932947)
+    - Add 129_clickpad.patch
+
+ -- Chase Douglas <[e-mail]>  Thu, 23 Feb 2012 11:54:37 -0800
+
+xserver-xorg-input-synaptics (1.5.99~git20120220-0ubuntu3) precise; urgency=low
+
+  * Fix crash on multitouch devices when disabled while typing (LP: #931344)
+    - Add temporary patch 130_tmp_touch_count_fix.patch
+
+ -- Chase Douglas <[e-mail]>  Tue, 21 Feb 2012 16:22:17 +0100
+
+xserver-xorg-input-synaptics (1.5.99~git20120220-0ubuntu2) precise; urgency=low
+
+  * Prevent trackpad pointer drift (LP: #921082)
+    - Add temporary patch 129_tmp_pointer_drift.patch from upstream
+
+ -- Chase Douglas <[e-mail]>  Mon, 20 Feb 2012 11:55:23 +0100
+
+xserver-xorg-input-synaptics (1.5.99~git20120220-0ubuntu1) precise; urgency=low
+
+  * Update to latest code in git (f9a9065)
+    - Scale single-touch values to multitouch axes (LP: #936856)
+
+ -- Chase Douglas <[e-mail]>  Mon, 20 Feb 2012 11:13:10 +0100
+
+xserver-xorg-input-synaptics (1.5.0+git20120210-0ubuntu2) precise; urgency=low
+
+  * Enable tap-and-drag locked drags by default
+  * Disable three-click action by default so three touch gestures work
+
+ -- Chase Douglas <[e-mail]>  Mon, 13 Feb 2012 20:51:56 -0800
+
+xserver-xorg-input-synaptics (1.5.0+git20120210-0ubuntu1) precise; urgency=low
+
+  * Update to latest code in git (e6032c3)
+  * Drop 127_multitouch.patch, merged upstream
+  * Drop 126_default_speed.patch, no longer necessary
+  * Refresh 125_option_rec_revert.patch
+  * Add 126_ubuntu_xi22.patch for ubuntu frankenserver support
+
+ -- Chase Douglas <[e-mail]>  Fri, 10 Feb 2012 18:27:53 -0800
+
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu2) precise; urgency=low
+
+  * Add some error handling so eventcomm-test doesn't segfault
+    - Modified 127_multitouch.patch
+
+ -- Chase Douglas <[e-mail]>  Thu, 19 Jan 2012 17:44:47 -0800
+
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1) precise; urgency=low
+
+  * Add multitouch support
+    - Add 127_multitouch.patch
+  * Bump Build-Depends for x11proto-input-dev to 2.1.99.5
+  * Remove obsolete dependencies on utouch-grail and old xserver-xorg-core
+
+ -- Chase Douglas <[e-mail]>  Thu, 19 Jan 2012 16:39:31 -0800
+
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt3) precise; urgency=low
+
+  * Fix default speed due to change in motion estimation
+    - Add 126_default_speed.patch
+
+ -- Chase Douglas <[e-mail]>  Thu, 12 Jan 2012 03:59:25 -0800
+
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt2) precise; urgency=low
+
+  * Drop patch 122_revert_pressure_finger_default.patch, merged upstream
+
+ -- Chase Douglas <[e-mail]>  Mon, 09 Jan 2012 07:03:52 -0800
+
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt1) precise; urgency=low
+
+  * Lower xserver-xorg-dev build dep for Precise's X server
+  * Revert xf86OptionRec upstream changes
+    - This particular API change will not be in Precise's X server
+
+ -- Chase Douglas <[e-mail]>  Mon, 09 Jan 2012 07:00:49 -0800
+
 xserver-xorg-input-synaptics (1.5.0+git20120101-1) experimental; urgency=low
 
   * New upstream snapshot:
@@ -216,6 +722,54 @@ xserver-xorg-input-synaptics (1.5.0+git20120101-1) experimental; urgency=low
 
  -- Cyril Brulebois <[e-mail]>  Sun, 01 Jan 2012 07:54:51 +0100
 
+xserver-xorg-input-synaptics (1.5.0-2ubuntu1~nomt1) UNRELEASED; urgency=low
+
+  * Merge from Debian testing.  Remaining Ubuntu changes:
+    - 101_resolution_detect_option.patch:
+      + Provide an option to prevent synaptics from communicating the
+        touchpad size to the xserver. (LP: 327428)
+    - 103_enable_cornertapping.patch:
+      + Enable right/middle clicks by tapping in the bottom- and top-right
+        corners.
+    - 104_always_enable_tapping.patch:
+      + Enable tapping regardless of the presence of physical buttons.
+    - 106_always_enable_vert_edge_scroll.patch:
+      + Enable vertical edge tapping by default even if we enable two-finger
+        scrolling as well.
+    - 115_evdev_only.patch:
+      + Only bind to /dev/input/event* evdev devices (LP 624985)
+    - 118_quell_error_msg.patch:
+      + Don't print error "Unable to find a synaptics device" when used
+        on system that doesn't have a touchpad anyway. (LP: 716712)
+    - 122_revert_pressure_finger_default.patch:
+      + Fix spurious right click events on some trackpads (LP: 742213)
+    - 124_syndaemon_events.patch:
+      + Drain spurious events from XRecord connection as a work around
+        for a buggy X server. (LP: 754470)
+    - debian/control:
+      + Depend on udev.
+      + Move libxtst-dev to Build-Conflicts so syndaemon does not use XRecord,
+        preventing a wide range of crashes in _CallCallbacks. (LP: 774978)
+    - debian/gbp.conf:
+      + Specify ‘ubuntu’ branch.
+    - debian/local/51-synaptics-quirks.conf:
+      + Split out our synaptics quirks into 51-synaptics-quirks.conf
+    - debian/local/66-xorg-synaptics.rules:
+      + Add the udev rule back for tagging specific machines to be quirked.
+    - debian/xserver-xorg-input-synaptics.postinst.in:
+      + Trigger udev to pick up new udev rules
+  * Temporarily drop multitouch patches for X server 1.11 bringup:
+    + 116_xi2_1.patch
+    + 117_gestures.patch
+    + 119_active_area_touches.patch
+    + 120_active_touches_num_fingers.patch
+    + 121_semi-mt_num_fingers.patch
+    + 123_order_ProcessTouch_for_numFingers.patch
+  * debian/patches/122_revert_pressure_finger_default.patch:
+    + Refresh for new upstream
+
+ -- Christopher James Halse Rogers <[e-mail]>  Mon, 19 Dec 2011 11:10:25 +1100
+
 xserver-xorg-input-synaptics (1.5.0-2) unstable; urgency=low
 
   * Cherry-pick to fix regression on powerpc (Closes: #649002):
@@ -230,6 +784,69 @@ xserver-xorg-input-synaptics (1.5.0-1) unstable; urgency=low
 
  -- Cyril Brulebois <[e-mail]>  Fri, 11 Nov 2011 17:15:22 +0100
 
+xserver-xorg-input-synaptics (1.4.1-1ubuntu2) oneiric; urgency=low
+
+  * Really install the quirks files, and rename the udev rules file
+    to emphasize that it's about quirks.
+  * postinst: Bump the version check to run udevadm trigger on upgrade.
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 29 Sep 2011 22:16:55 +0300
+
+xserver-xorg-input-synaptics (1.4.1-1ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - 101_resolution_detect_option.patch:
+      + Provide an option to prevent synaptics from communicating the
+        touchpad size to the xserver. (LP: 327428)
+    - 103_enable_cornertapping.patch:
+      + Enable right/middle clicks by tapping in the bottom- and top-right
+        corners.
+    - 104_always_enable_tapping.patch:
+      + Enable tapping regardless of the presence of physical buttons.
+    - 106_always_enable_vert_edge_scroll.patch:
+      + Enable vertical edge tapping by default even if we enable two-finger
+        scrolling as well.
+    - 115_evdev_only.patch:
+      + Only bind to /dev/input/event* evdev devices (LP 624985)
+    - 116_xi2_1.patch:
+    - 117_gestures.patch:
+      + multitouch and uTouch gesture support
+    - 118_quell_error_msg.patch:
+      + Don't print error "Unable to find a synaptics device" when used
+        on system that doesn't have a touchpad anyway. (LP: 716712)
+    - 119_active_area_touches.patch:
+    - 120_active_touches_num_fingers.patch:
+    - 121_semi-mt_num_fingers.patch:
+      + Fix handling for SemiMultitouch trackpads with integrated buttons
+        (LP: 736523)
+    - 122_revert_pressure_finger_default.patch:
+      + Fix spurious right click events on some trackpads (LP: 742213)
+    - 123_order_ProcessTouch_for_numFingers.patch:
+      + Fix jumpy cursor on multitouch trackpads (LP: 751525)
+    - 124_syndaemon_events.patch:
+      + Drain spurious events from XRecord connection as a work around
+        for a buggy X server. (LP: 754470)
+    - debian/control:
+      + Add depends on libmtdev and libutouch-grail
+      + Build-depend on multitouch-enabled inputproto.
+      + Depend on multitouch-enabled xserver.
+      + Depend on udev.
+      + Move libxtst-dev to Build-Conflicts so syndaemon does not use XRecord,
+        preventing a wide range of crashes in _CallCallbacks. (LP: 774978)
+    - debian/gbp.conf:
+      + Specify ‘ubuntu’ branch.
+    - debian/local/51-synaptics-quirks.conf:
+      + Split out our synaptics quirks into 51-synaptics-quirks.conf
+    - debian/local/66-xorg-synaptics.rules:
+      + Add the udev rule back for tagging specific machines to be quirked.
+    - debian/xserver-xorg-input-synaptics.postinst.in:
+      + Trigger udev to pick up new udev rules
+  * Drop 114_jumpy_cursor_first_part.patch, fixed upstream.
+  * Update 115_evdev_only.patch to apply.
+  * Update 117_gestures.patch to apply.
+
+ -- Timo Aaltonen <[e-mail]>  Tue, 05 Jul 2011 16:40:31 +0300
+
 xserver-xorg-input-synaptics (1.4.1-1) unstable; urgency=low
 
   * New upstream release:
@@ -273,6 +890,144 @@ xserver-xorg-input-synaptics (1.3.0-2) unstable; urgency=low
 
  -- Cyril Brulebois <[e-mail]>  Sat, 05 Feb 2011 14:40:47 +0100
 
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu15) oneiric; urgency=low
+
+  * Also build-conflict with libxtst-dev as to make sure it's not present in
+    e.g. local debug builds.
+
+ -- Loïc Minier <[e-mail]>  Fri, 10 Jun 2011 18:01:59 +0200
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu14) oneiric; urgency=low
+
+  * Drop libxtst-dev build dependency so syndaemon does not use XRecord,
+    preventing a wide range of crashes in _CallCallbacks. (LP: #774978)
+
+ -- Robert Hooker <[e-mail]>  Mon, 23 May 2011 10:13:09 -0400
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu13) oneiric; urgency=low
+
+  * Re-add 116_resolution_detect_option.patch as 101_resolution_detect_option.patch:
+    - This patch was introduced in 1.2.2-2ubuntu7 but got erroneously dropped in the
+      merge for 1.3.99+git20110116.0e27ce3a-0ubuntu1.
+      (LP: #327428)
+
+ -- Bryce Harrington <[e-mail]>  Fri, 20 May 2011 11:14:44 -0700
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu12) natty; urgency=low
+
+  * syndaemon: Drain spurious events from XRecord connection as a work around
+    for a buggy X server. This keeps syndaemon from busy looping
+    (LP: #754470)
+
+ -- Chase Douglas <[e-mail]>  Thu, 14 Apr 2011 14:15:33 -0400
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu11) natty; urgency=low
+
+  * Fix jumpy cursor on multitouch trackpads (LP: #751525)
+    - Added 123_order_ProcessTouch_for_numFingers.patch
+
+ -- Chase Douglas <[e-mail]>  Tue, 05 Apr 2011 11:03:12 -0400
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu10) natty; urgency=low
+
+  * Ensure touch mask exists before clearing it (LP: #747126)
+
+ -- Chase Douglas <[e-mail]>  Fri, 01 Apr 2011 08:40:59 -0400
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu9) natty; urgency=low
+
+  * Fix handling for SemiMultitouch trackpads with integrated buttons
+    (LP: #736523)
+    - Added 119_active_area_touches.patch
+    - Added 120_active_touches_num_fingers.patch
+    - Added 121_semi-mt_num_fingers.patch
+  * Fix spurious right click events on some trackpads (LP: #742213)
+    - Added 122_revert_pressure_finger_default.patch
+
+ -- Chase Douglas <[e-mail]>  Wed, 30 Mar 2011 10:54:50 -0400
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu8) natty; urgency=low
+
+  * Disable SemiMultitouch devices, we don't support them yet (LP: #723905)
+
+ -- Chase Douglas <[e-mail]>  Tue, 15 Mar 2011 16:16:21 -0400
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu7) natty; urgency=low
+
+  * Set event window correctly for global gesture event
+    (LP: #728696)
+
+ -- Chase Douglas <[e-mail]>  Fri, 04 Mar 2011 15:40:43 -0500
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu6) natty; urgency=low
+
+  * Fix silly typo in patch name
+
+ -- Bryce Harrington <[e-mail]>  Wed, 02 Mar 2011 13:06:17 -0800
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu5) natty; urgency=low
+
+  * Add 118_quell_error_msg.patch:  Don't print error "Unable to find a
+    synaptics device" when used on system that doesn't have a touchpad anyway.
+    (LP: #716712)
+  * Renumber patches 200 and 201 to 116 and 117 so are consistent with the
+    other ubuntu patches.
+
+ -- Bryce Harrington <[e-mail]>  Wed, 02 Mar 2011 12:16:32 -0800
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu4) UNRELEASED; urgency=low
+
+  * Add in xi 2.1 support and uTouch gesture support
+    - Added 200_xi2.1.patch
+    - Added 201_gestures.patch
+    - Add depends on libmtdev and libutouch-grail
+
+ -- Chase Douglas <[e-mail]>  Sun, 20 Feb 2011 19:23:11 -0500
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu3) natty; urgency=low
+
+  * debian/control: Bump build-depend on xserver-xorg-dev to really, really
+    build against Xserver 1.10
+
+ -- Christopher James Halse Rogers <[e-mail]>  Tue, 01 Feb 2011 20:46:57 +1100
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu2) natty; urgency=low
+
+  * Rebuild against Xserver 1.10
+
+ -- Bryce Harrington <[e-mail]>  Mon, 31 Jan 2011 18:37:55 -0800
+
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu1) natty; urgency=low
+
+  [ Cyril Brulebois ]
+  * Switch to Architecture: any, adding armhf support (Closes: #604672).
+
+  [ Christopher James Halse Rogers ]
+  * Merge from (unreleased) Debian experimental.  Remaining Ubuntu changes:
+    - Split out our synaptics quirks into 51-synaptics-quirks.conf
+    - Add the udev rule back for tagging specific machines to be quirked
+    - Trigger udev in postinst to pick up udev rules
+    - add Depend: on udev
+    - 103_enable_cornertapping.patch: Enable right/middle clicks by
+      tapping in the bottom- and top-right corners.
+    - 104_always_enable_tapping.patch: Enable tapping regardless of the
+      presence of physical buttons.
+    - 106_always_enable_vert_edge_scroll.patch: Enable vertical edge
+      tapping by default even if we enable two-finger scrolling as well.
+    - 114_jumpy_cursor_first_part.patch: Adds a property to enable filtering
+      jumpy cursor problems on some machines.
+    - Specify ‘ubuntu’ branch in gbp.conf
+    - 115_evdev_only.patch: Only bind to /dev/input/event* evdev devices
+      (LP 624985)
+  * Update to git snapshot to fix build against Xserver 1.10 input API
+  * debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch:
+    - Refresh for new upstream.
+  * debian/patches/114_jumpy_cursor_first_part.patch:
+    - Refresh for new upstream.  Drop the multi-touch chunk of the quirk,
+      as that is handled by upstream commit a6ca4d25.
+
+ -- Christopher James Halse Rogers <[e-mail]>  Tue, 25 Jan 2011 20:01:58 +1100
+
 xserver-xorg-input-synaptics (1.3.0-1) experimental; urgency=low
 
   [ Robert Hooker ]
@@ -301,6 +1056,78 @@ xserver-xorg-input-synaptics (1.2.2-3) experimental; urgency=low
 
  -- Cyril Brulebois <[e-mail]>  Wed, 13 Oct 2010 00:26:45 +0200
 
+xserver-xorg-input-synaptics (1.2.2-2ubuntu7) natty; urgency=low
+
+  * Add 116_resolution_detect_option.patch: Provide an option to prevent
+    synaptics from communicating the touchpad size to the xserver.  This
+    can be used to solve problems where differences in touchpad and screen
+    dimensions cause the mouse pointer to skip pixels when moving.
+    (LP: #327428)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 01 Dec 2010 17:03:44 -0800
+
+xserver-xorg-input-synaptics (1.2.2-2ubuntu6) natty; urgency=low
+
+  * Add quirk for Dell Inspiron 6400 to register taps more reliably.
+    The touchpad hardware occasionally sends invalid (1, 5855) coords
+    for taps, which the driver then interprets as a corner tap, which
+    by default get ignored.  Instead of ignoring them, we treat them
+    as left-button clicks.
+    (LP #133060)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 01 Dec 2010 12:32:39 -0800
+
+xserver-xorg-input-synaptics (1.2.2-2ubuntu5) maverick; urgency=low
+
+  * 115_evdev_only.patch was added but never applied. (LP: #624985)
+
+ -- Chase Douglas <[e-mail]>  Sat, 18 Sep 2010 15:19:21 +0200
+
+xserver-xorg-input-synaptics (1.2.2-2ubuntu4) maverick; urgency=low
+
+  [Chase Douglas]
+  * 115_evdev_only.patch:
+    - Prevent non-evdev devices from firing the eventcomm AutoDevProbe callback
+      (LP: #624985)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 15 Sep 2010 16:27:29 -0700
+
+xserver-xorg-input-synaptics (1.2.2-2ubuntu3) maverick; urgency=low
+
+  * Rebuild against new Xserver 1.9 ABI
+
+ -- Christopher James Halse Rogers <[e-mail]>  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 <[e-mail]>  Fri, 06 Aug 2010 12:26:59 +0200
+
+xserver-xorg-input-synaptics (1.2.2-2ubuntu1) maverick; urgency=low
+
+  [ Robert Hooker ]
+  * Merge from debian unstable, remaining changes:
+    - Split out our synaptics quirks into 51-synaptics-quirks.conf
+    - Add the udev rule back for tagging specific machines to be quirked
+    - 103_enable_cornertapping.patch: Enable right/middle clicks by
+      tapping in the bottom- and top-right corners.
+    - 104_always_enable_tapping.patch: Enable tapping regardless of the
+      presence of physical buttons.
+    - 106_always_enable_vert_edge_scroll.patch: Enable vertical edge
+      tapping by default even if we enable two-finger scrolling as well.
+    - 114_jumpy_cursor_first_part.patch: Adds a property to enable filtering
+      jumpy cursor problems on some machines.
+  * Add a dependency on udev.
+
+  [ Christopher James Halse Rogers ]
+  * debian/gbp.conf:
+    - Make git-buildpackage less annoying by specifying “ubuntu” as our debian
+      branch.
+
+ -- Robert Hooker <[e-mail]>  Mon, 07 Jun 2010 19:07:59 -0400
+
 xserver-xorg-input-synaptics (1.2.2-2) unstable; urgency=low
 
   * Cherry-pick patch from upstream git to add the xorg.conf.d snippet.
@@ -318,6 +1145,19 @@ xserver-xorg-input-synaptics (1.2.2-2) unstable; urgency=low
 
  -- Cyril Brulebois <[e-mail]>  Sat, 17 Apr 2010 17:48:26 +0200
 
+xserver-xorg-input-synaptics (1.2.2-1ubuntu2) lucid; urgency=low
+
+  * 10-synaptics.conf: Use 'MatchDevicePath "/dev/input/event*"'.
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 01 Apr 2010 14:34:20 +0300
+
+xserver-xorg-input-synaptics (1.2.2-1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian unstable. (LP: #546933)
+  * Rewrite old quirks to use ID_INPUT.tags.
+
+ -- Timo Aaltonen <[e-mail]>  Wed, 31 Mar 2010 00:27:07 +0300
+
 xserver-xorg-input-synaptics (1.2.2-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
@@ -353,6 +1193,22 @@ xserver-xorg-input-synaptics (1.2.1-1) unstable; urgency=low
 
  -- Cyril Brulebois <[e-mail]>  Fri, 08 Jan 2010 00:55:04 +0100
 
+xserver-xorg-input-synaptics (1.2.0-3ubuntu1) lucid; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    - 103_enable_cornertapping.patch: Enable right/middle clicks by
+      tapping in the bottom- and top-right corners.
+    - 104_always_enable_tapping.patch: Enable tapping regardless of the
+      presence of physical buttons.
+    - 106_always_enable_vert_edge_scroll.patch: Enable vertical edge 
+      tapping by default even if we enable two-finger scrolling as well.
+  * Disabled until fixed to apply and work:
+    - 114_jumpy_cursor_first_part.patch
+  * Dropped, using udev now:
+    - 115_jumpy_cursor_second_part.patch
+
+ -- Timo Aaltonen <[e-mail]>  Mon, 07 Dec 2009 22:58:38 +0200
+
 xserver-xorg-input-synaptics (1.2.0-3) experimental; urgency=low
 
   [ Julien Cristau ]
@@ -393,6 +1249,87 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
 
  -- Mattia Dongili <[e-mail]>  Thu, 19 Nov 2009 21:24:49 +0900
 
+xserver-xorg-input-synaptics (1.1.2-1ubuntu7) karmic; urgency=low
+
+  * debian/patches:
+    - 115_jumpy_cursor_second_part.patch: Set AreaBottomEdge to
+      4100 for Inspiron 1011 and Inspiron 1012. 
+
+ -- Alberto Milone <[e-mail]>  Wed, 14 Oct 2009 16:55:16 +0200
+
+xserver-xorg-input-synaptics (1.1.2-1ubuntu6) karmic; urgency=low
+
+  * debian/patches:
+    - Split 114_jumpy_cursor_threshold.patch into 
+      114_jumpy_cursor_first_part.patch and
+      115_jumpy_cursor_second_part.patch so as to keep options
+      which belong in the fdi file separate from the code.
+    - 115_jumpy_cursor_second_part.patch:
+      + Add quirk for Inspiron 1012.
+    - Remove 114_jumpy_cursor_threshold.patch_old.
+
+ -- Alberto Milone <[e-mail]>  Mon, 05 Oct 2009 12:09:14 +0200
+
+xserver-xorg-input-synaptics (1.1.2-1ubuntu5) karmic; urgency=low
+
+  * Add lpia to the list of Architectures.  LP: #413579.
+
+ -- Steve Langasek <[e-mail]>  Mon, 07 Sep 2009 10:44:54 -0700
+
+xserver-xorg-input-synaptics (1.1.2-1ubuntu4) karmic; urgency=low
+
+  * debian/patches:
+    - 112_jumpy_cursor_quirks.patch:
+      + Drop patch.
+    - 114_jumpy_cursor_threshold.patch:
+      + Replace 112_jumpy_cursor_quirks.patch.
+      + Make the threshold an XInput property.
+      + Add quirk for Dell Mini10v and for HP Mini 1000 in the
+        fdi file.
+
+ -- Alberto Milone <[e-mail]>  Wed, 02 Sep 2009 10:44:28 +0200
+
+xserver-xorg-input-synaptics (1.1.2-1ubuntu3) karmic; urgency=low
+
+  * debian/patches:
+    - 112_jumpy_cursor_quirks.patch: Make sure that the quirk
+      affects only the Dell Mini 10v (LP: #405943).
+    - 103_enable_cornertapping.patch: Don't trigger middle click
+      when tapping on the top right corner button (LP: #386017).
+
+ -- Alberto Milone <[e-mail]>  Mon, 17 Aug 2009 10:31:14 +0200
+
+xserver-xorg-input-synaptics (1.1.2-1ubuntu2) karmic; urgency=low
+
+  * debian/patches:
+    - 105_correct_multifinger_click.patch: Drop patch as it breaks
+      the expected behavior for multitouch clicking (LP: #320585).
+    - 111_add_active_area.patch: Backport "Synaptics Area" property
+      from upstream (LP: #402863).
+    - 112_jumpy_cursor_quirks.patch: Add Quirk for Dell Mini 10v 
+      touchpad (LP: #402863).
+    - 113_add_capabilities.patch: Backport read-only "Synaptics 
+      Capabilities" property from upstream.
+
+ -- Alberto Milone <[e-mail]>  Wed, 22 Jul 2009 10:42:11 +0200
+
+xserver-xorg-input-synaptics (1.1.2-1ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable, Remaining changes:
+    - Restore the Ubuntu patch series. (LP: #378391)
+     - 103_enable_cornertapping.patch: Enable right/middle clicks by
+       tapping in the bottom- and top-right corners.
+     - 104_always_enable_tapping.patch: Enable tapping regardless of the
+       presence of physical buttons.
+     - 105_correct_multifinger_click.patch: Swap the right/middle clicks
+       generated by multi-finger tapping.
+     - 106_always_enable_vert_edge_scroll.patch: Enable vertical edge 
+       tapping by default even if we enable two-finger scrolling as well.
+     - 110_remove_bound_auto_adjust.patch: Don't auto-adjust to bounds of
+       the hardware scroll area.
+
+ -- Robert Hooker (Sarvatt) <[e-mail]>  Sun, 28 Jun 2009 18:13:52 -0400
+
 xserver-xorg-input-synaptics (1.1.2-1) unstable; urgency=low
 
   [ Mattia Dongili ]
@@ -444,6 +1381,52 @@ xserver-xorg-input-synaptics (0.99.3-3) experimental; urgency=low
 
  -- Julien Cristau <[e-mail]>  Mon, 26 Jan 2009 09:08:10 +0100
 
+xfree86-driver-synaptics (0.99.3-2ubuntu4) jaunty; urgency=low
+
+  * debian/patches/110_remove_bound_auto_adjust.patch:
+    - Small change to make sure that the driver does not
+      auto-adjust to the bounds of the hardware scroll area
+      as this causes problem to the touchpads of Acer Aspire
+      One units (LP: #320632).
+
+ -- Alberto Milone <[e-mail]>  Thu, 26 Mar 2009 17:00:52 +0100
+
+xfree86-driver-synaptics (0.99.3-2ubuntu3) jaunty; urgency=low
+
+  * debian/patches/109_override_alps_settings.patch:
+    - Add customised settings for ALPS touchpad (LP: #320632):
+      o Enable vertTwoFingerScroll by default.
+      o Set RightEdge to 900.
+      o Set ClickTime to 0.
+      o Set SingleTapTimeout to 0.
+      o Set MinSpeed to 0.45.
+      o Set MaxSpeed to 0.75.
+  * debian/patches/107_reduce_cursor_speed.patch:
+    - drop and merge with 109_override_alps_settings.patch.
+
+ -- Alberto Milone (tseliot) <[e-mail]>  Sat, 28 Feb 2009 10:20:08 +0100
+
+xfree86-driver-synaptics (0.99.3-2ubuntu2) jaunty; urgency=low
+
+  [Alberto Milone]
+  * debian/patches/105_always_enable_multifinger_click.patch:
+    - Drop patch
+  * debian/patches/105_correct_multifinger_click.patch:
+    - Fix inverted buttons
+    - Restore ability to drag and drop with physical buttons
+    (LP: #320632)
+
+ -- Alberto Milone (tseliot) <[e-mail]>  Sat, 31 Jan 2009 18:48:37 +0100
+
+xfree86-driver-synaptics (0.99.3-2ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian experimental.
+  * Revive syndaemon_xinput_props.patch, now refreshed as 108.
+    Thanks to John S. Gruber for noticing it was dropped in haste.
+    (LP: #321355)
+
+ -- Timo Aaltonen <[e-mail]>  Mon, 26 Jan 2009 09:57:07 +0200
+
 xfree86-driver-synaptics (0.99.3-2) experimental; urgency=low
 
   * Update our copy of xsfbs to get a fixed serverabi rule and generate
@@ -452,6 +1435,35 @@ xfree86-driver-synaptics (0.99.3-2) experimental; urgency=low
 
  -- Julien Cristau <[e-mail]>  Mon, 26 Jan 2009 04:43:08 +0100
 
+xfree86-driver-synaptics (0.99.3-1ubuntu2) jaunty; urgency=low
+
+  [ Alberto Milone (tseliot) ]
+  * 103_enable_cornertapping.patch:
+    - Update patch for the new upstream release. (LP: #320632)
+  * 104_always_enable_tapping.patch:
+    - Enable tapping even when a physical left button is available. (LP: #320585)
+  * 105_always_enable_multifinger_click.patch:
+    - Enable multifinger click (where available) even when physical right/middle
+      buttons are available. (LP: #320585)
+  * 106_always_enable_vert_edge_scroll.patch:
+    - Enable scrolling even when doubletap is available. (LP: #320632)
+  * 107_reduce_cursor_speed.patch:
+    - Reduce the cursor speed. (LP: #320639)
+
+ -- Timo Aaltonen <[e-mail]>  Sat, 24 Jan 2009 20:29:04 +0200
+
+xfree86-driver-synaptics (0.99.3-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian experimental.
+  * Drop obsolete patches:
+    -101_no_horizscroll.patch
+    -102_dont_check_abi.diff
+    -104_syndaemon_xinput_props.patch
+    -105_no_bcm5974_shmconfig.patch
+  * Update 103_enable_cornertapping.patch to apply.
+
+ -- Timo Aaltonen <[e-mail]>  Fri, 23 Jan 2009 14:30:34 +0200
+
 xfree86-driver-synaptics (0.99.3-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
@@ -466,6 +1478,105 @@ xfree86-driver-synaptics (0.99.3-1) experimental; urgency=low
 
  -- Julien Cristau <[e-mail]>  Wed, 21 Jan 2009 22:27:10 +0100
 
+xfree86-driver-synaptics (0.15.2-0ubuntu5) intrepid; urgency=low
+
+  * Cherry-picked commit db6e63, "Return correctly on successful property
+    setting"
+  * debian/patches/104_syndaemon_xinput_props.patch:  Add support for XInput
+    device properties to syndaemon.
+  * debian/patches/105_no_bcm5974_shmconfig.patch: Remove the SHMConfig
+    enabling line from the bcm5974 section of the fdi file. (LP: #282004)
+
+ -- William Grant <[e-mail]>  Mon, 13 Oct 2008 21:48:05 +1100
+
+xfree86-driver-synaptics (0.15.2-0ubuntu4) intrepid; urgency=low
+
+  * Cherry-picked commit 355e845, "Adjust to new property API".
+    (LP: #274728)
+  * Refresh patches 101 & 102.
+  * Bump the build-dep on libxi-dev and xserver-xorg-dev.
+
+ -- Timo Aaltonen <[e-mail]>  Mon, 29 Sep 2008 10:23:16 +0300
+
+xfree86-driver-synaptics (0.15.2-0ubuntu3) intrepid; urgency=low
+
+  * Also build for lpia; LP: #275158.
+
+ -- Loic Minier <[e-mail]>  Sat, 27 Sep 2008 16:11:42 +0200
+
+xfree86-driver-synaptics (0.15.2-0ubuntu2) intrepid; urgency=low
+
+  [ Alberto Milone ]
+  * 103_enable_cornertapping.patch:
+    - Revert some defaults back to previous values, to fix corner tapping
+      and MaxTapMove. (LP: #271823)
+
+ -- Timo Aaltonen <[e-mail]>  Tue, 23 Sep 2008 10:46:44 +0300
+
+xfree86-driver-synaptics (0.15.2-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release. (LP: #262276, #268071, #247433, #262305)
+  * Drop 101_ubuntu.diff, superseded by input properties.
+  * Drop 103_fix_off_by_one.diff, applied upstream.
+  * 101_no_horizscroll.patch:
+    - Disable horizontal scrolling by defaulting to FALSE instead of changing
+      the fdi file.
+  * 102_dont_check_abi.diff:
+    - Remove one more check from src/synaptics.c, which was added recently.
+
+ -- Timo Aaltonen <[e-mail]>  Fri, 12 Sep 2008 01:32:57 +0300
+
+xfree86-driver-synaptics (0.15.0+git20080820-1ubuntu5) intrepid; urgency=low
+
+  * Rebuild to fix dependency against xserver-xorg-core.
+
+ -- Timo Aaltonen <[e-mail]>  Wed, 03 Sep 2008 17:45:20 +0300
+
+xfree86-driver-synaptics (0.15.0+git20080820-1ubuntu4) intrepid; urgency=low
+
+  * Run autoreconf at build time; build-depend on automake, libtool and
+    xutils-dev.
+  * Enable 102 again, since the problem with it was that Makefile.in was
+    not regenerated.
+  * Add 103_fix_off_by_one.diff to fix the number of arguments for 
+    properties. Thanks William Grant!
+  * Pull 3d39926875446e from upstream/master: 
+    - Re-enable TapButtons and CornerButtons to work by default.
+    (LP: #262292)
+
+ -- Timo Aaltonen <[e-mail]>  Sat, 30 Aug 2008 18:20:14 +0300
+
+xfree86-driver-synaptics (0.15.0+git20080820-1ubuntu3) intrepid; urgency=low
+
+  * Disable 102 for now, since the property stuff doesn't seem to be 
+    working right. (LP: #262986)
+
+ -- Timo Aaltonen <[e-mail]>  Sat, 30 Aug 2008 16:52:51 +0300
+
+xfree86-driver-synaptics (0.15.0+git20080820-1ubuntu2) intrepid; urgency=low
+
+  * 102_dont_check_abi.diff:
+    - Don't check ABI_MAJOR, since we have all that's needed for 
+      properties.
+
+ -- Timo Aaltonen <[e-mail]>  Sat, 30 Aug 2008 13:27:54 +0300
+
+xfree86-driver-synaptics (0.15.0+git20080820-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    - debian/control:
+      + Drop the dummy package
+      + Change the maintainer address
+    - debian/patches:
+      101_ubuntu.diff
+      + Various fixes, split this.
+    - fdi/11-x11-synaptics.fdi
+      + Modify to disable horizontal scrolling like our dexconf used to do.
+  * Pull in support for input properties.
+  * Drop 102_polling.diff, since it's upstream.
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 28 Aug 2008 02:09:47 +0300
+
 xfree86-driver-synaptics (0.15.0+git20080820-1) experimental; urgency=low
 
   * Update to latest upstream git
@@ -505,6 +1616,48 @@ xfree86-driver-synaptics (0.14.7~git20070706-2.1.lenny1) unstable; urgency=low
 
  -- Julien Cristau <[e-mail]>  Mon, 18 Aug 2008 01:41:39 +0200
 
+xfree86-driver-synaptics (0.14.7~git20070706-2.1ubuntu4) intrepid; urgency=low
+
+  * Fix the fdi file to disable horizontal scrolling like dexconf used
+    to do.
+
+ -- Timo Aaltonen <[e-mail]>  Mon, 18 Aug 2008 16:27:30 +0300
+
+xfree86-driver-synaptics (0.14.7~git20070706-2.1ubuntu3) intrepid; urgency=low
+
+  * Enable input-hotplug: install 10-synaptics.fdi in 
+    /usr/share/hal/fdi/policy/20thirdparty.
+
+ -- Timo Aaltonen <[e-mail]>  Fri, 01 Aug 2008 09:58:32 +0300
+
+xfree86-driver-synaptics (0.14.7~git20070706-2.1ubuntu2) intrepid; urgency=low
+
+  * Rebuild against the new xserver-xorg-dev.
+
+ -- Timo Aaltonen <[e-mail]>  Mon, 07 Jul 2008 17:45:08 +0300
+
+xfree86-driver-synaptics (0.14.7~git20070706-2.1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Rename the source
+    - debian/control:
+      + Drop the dummy package
+      + Change the maintainer address.
+      + Add quilt to build-deps.
+    - Makefile: Add -fno-stack-protector.
+    - debian/patches:
+      100_fix_vt_handling.diff
+      + Something is opening the device even after we've switched away
+        from the VT. The easiest way to handle this is to refuse to open
+        unless we're on the current VT.
+      101_ubuntu.diff
+      + Various fixes, split this.
+      102_polling.diff
+      + Added a patch which increases the polling timeout to save some
+        battery life
+
+ -- Bryce Harrington <[e-mail]>  Mon, 09 Jun 2008 22:27:20 -0700
+
 xfree86-driver-synaptics (0.14.7~git20070706-2.1) unstable; urgency=low
 
   * Non-maintainer upload, with Mattia's agreement.
@@ -524,6 +1677,47 @@ xfree86-driver-synaptics (0.14.7~git20070706-2) unstable; urgency=low
 
  -- Mattia Dongili <[e-mail]>  Tue, 01 Jan 2008 12:38:13 +0900
 
+xfree86-driver-synaptics (0.14.7~git20070706-1ubuntu4) hardy; urgency=low
+
+  * 102_polling.diff:
+    - Added a patch which increases the polling timeout to save some
+      battery life (LP: #184398).
+
+ -- Timo Aaltonen <[e-mail]>  Wed, 27 Feb 2008 11:58:01 +0200
+
+xfree86-driver-synaptics (0.14.7~git20070706-1ubuntu3) hardy; urgency=low
+
+  * debian/patches/101_ubuntu.diff:
+    - extend to support disabling the touchpad
+    - remove unused bits of the patch
+
+ -- Scott James Remnant <[e-mail]>  Tue, 22 Jan 2008 13:40:07 +0000
+
+xfree86-driver-synaptics (0.14.7~git20070706-1ubuntu2) hardy; urgency=low
+
+  * Change the source name to match Debian.
+
+ -- Timo Aaltonen <[e-mail]>  Fri, 11 Jan 2008 11:59:09 +0200
+
+xserver-xorg-input-synaptics (0.14.7~git20070706-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+    - Rename the source
+    - debian/control:
+      + Drop the dummy package
+      + Change the maintainer address.
+      + Add quilt to build-deps.
+    - Makefile: Add -fno-stack-protector.
+    - debian/patches:
+      100_fix_vt_handling.diff
+      + Something is opening the device even after we've switched away
+        from the VT. The easiest way to handle this is to refuse to open
+        unless we're on the current VT.
+      101_ubuntu.diff
+      + Various fixes, split this.
+
+ -- Timo Aaltonen <[e-mail]>  Fri, 09 Nov 2007 02:23:16 +0200
+
 xfree86-driver-synaptics (0.14.7~git20070706-1) unstable; urgency=low
 
   * build with xserver-xorg-core 1.4 (Closes: #442314)
@@ -566,6 +1760,81 @@ xfree86-driver-synaptics (0.14.6-2) unstable; urgency=low
 
  -- Mattia Dongili <[e-mail]>  Wed, 03 Jan 2007 18:38:40 +0100
 
+xserver-xorg-input-synaptics (0.14.6-0ubuntu10) gutsy; urgency=low
+
+  * Bodge around LP: #68370. Something is opening the device even after 
+    we've switched away from the VT. The easiest way to handle this is 
+    to refuse to open unless we're on the current VT.
+
+ -- Matthew Garrett <[e-mail]>  Tue, 09 Oct 2007 21:08:23 +0100
+
+xserver-xorg-input-synaptics (0.14.6-0ubuntu9) gutsy; urgency=low
+
+  * Actually include the parameter setting code
+
+ -- Matthew Garrett <[e-mail]>  Mon, 17 Sep 2007 17:56:53 +0100
+
+xserver-xorg-input-synaptics (0.14.6-0ubuntu8) gutsy; urgency=low
+
+  * Fix the build system so it works properly on 64-bit platforms
+  * Add initial support for setting some paramaters via X
+
+ -- Matthew Garrett <[e-mail]>  Sun, 16 Sep 2007 18:18:17 +0100
+
+xserver-xorg-input-synaptics (0.14.6-0ubuntu7) feisty; urgency=low
+
+  * X and Y size calculations were inverted for edge scrolling
+  * Additionally, the values were scaled incorrectly (LP: #95858)
+
+ -- Matthew Garrett <[e-mail]>  Sun, 25 Mar 2007 16:13:42 +0100
+
+xserver-xorg-input-synaptics (0.14.6-0ubuntu6) feisty; urgency=low
+
+  * Set defaults based on values the kernel gives us, rather than making stuff
+    up in an utterly miserable manner. This upload brought to you by Milton
+    Nero, a deeply flavoured oat stout. 
+
+ -- Matthew Garrett <[e-mail]>  Sat, 24 Mar 2007 15:08:26 +0000
+
+xserver-xorg-input-synaptics (0.14.6-0ubuntu5) feisty; urgency=low
+
+  * Attempt to set more reasonable defaults for appletouch devices. Better
+    now, but still not perfect. 
+
+ -- Matthew Garrett <[e-mail]>  Sat, 24 Mar 2007 02:44:11 +0000
+
+xserver-xorg-input-synaptics (0.14.6-0ubuntu4) feisty; urgency=low
+
+  * debian/control: Update maintainer fields according to debian-
+    maintainer-field spec.
+
+ -- Martin Pitt <[e-mail]>  Mon, 12 Mar 2007 14:58:39 +0000
+
+xserver-xorg-input-synaptics (0.14.6-0ubuntu3) edgy; urgency=low
+
+  * Add the ugly ALPS hack back
+
+ -- Matthew Garrett <[e-mail]>  Mon,  7 Aug 2006 22:55:42 +0100
+
+xserver-xorg-input-synaptics (0.14.6-0ubuntu2) edgy; urgency=low
+
+  * Disable Stack Protection for this package for now (module loading fails
+    due to missing symbols)
+
+ -- Rodrigo Parra Novo <[e-mail]>  Mon, 31 Jul 2006 09:39:16 -0300
+
+xserver-xorg-input-synaptics (0.14.6-0ubuntu1) edgy; urgency=low
+
+  * New Upstream release
+  * New versioned Build-Depends on xserver-xorg-dev (>= 1.1.1)
+  * New versioned Build-Depends on xserver-xorg-core (>= 1.1.1)
+  * Fixed debian/rules to match current Makefile rules (based on Debian
+    xfree86-driver-synaptics package)
+  * Fixed Makefile and manual page, also based on Debian xfree86-driver-synaptics
+  * Dropped Alps patches - unfortunately they don't apply anymore
+
+ -- Rodrigo Parra Novo <[e-mail]>  Thu, 27 Jul 2006 12:18:18 -0300
+
 xfree86-driver-synaptics (0.14.5-1) unstable; urgency=low
 
   * New upstream release.
@@ -611,6 +1880,76 @@ xfree86-driver-synaptics (0.14.4-1) unstable; urgency=low
 
  -- Mattia Dongili <[e-mail]>  Mon, 07 Nov 2005 22:54:40 +0100
 
+xserver-xorg-input-synaptics (0.14.3+seriouslythistime-0ubuntu4) dapper; urgency=low
+
+  * New versioned Build-Depends on xserver-xorg-dev (>= 1.1.1)
+  * New versioned Build-Depends on xserver-xorg-core (>= 1.1.1)
+
+ -- Rodrigo Parra Novo <[e-mail]>  Thu, 27 Jul 2006 11:59:57 -0300
+
+xserver-xorg-input-synaptics (0.14.3+seriouslythistime-0ubuntu3) dapper; urgency=low
+
+  * Horrible workaround to avoid massive ALPS-related suckage
+
+ -- Matthew Garrett <[e-mail]>  Wed, 22 Mar 2006 21:02:26 +0000
+
+xserver-xorg-input-synaptics (0.14.3+seriouslythistime-0ubuntu2) dapper; urgency=low
+
+  * Build with -fPIC to fix FTBFS
+
+ -- Tollef Fog Heen <[e-mail]>  Wed, 11 Jan 2006 16:20:57 +0100
+
+xserver-xorg-input-synaptics (0.14.3+seriouslythistime-0ubuntu1) dapper; urgency=low
+
+  * Bounce straight back to 0.14.3.
+
+ -- Daniel Stone <[e-mail]>  Tue, 25 Oct 2005 19:12:28 +1000
+
+xorg-driver-synaptics (0.14.3+revertedto+0.13.6-0ubuntu3) breezy; urgency=low
+
+  * Change dependency on xserver-xorg to -core (closes: Ubuntu#15902).
+
+ -- Daniel Stone <[e-mail]>  Fri, 16 Sep 2005 17:42:34 +1000
+
+xorg-driver-synaptics (0.14.3+revertedto+0.13.6-0ubuntu2) breezy; urgency=low
+
+  * Build client utilities without includes from Xincludes.
+
+ -- Daniel Stone <[e-mail]>  Wed,  7 Sep 2005 16:31:51 +1000
+
+xorg-driver-synaptics (0.14.3+revertedto+0.13.6-0ubuntu1) breezy; urgency=low
+
+  * Revert to old upstream version for preview at least, as the new was quite
+    catastrophically broken with ALPS.  Fixed some, broke a lot (closes:
+    Ubuntu#14480).
+  * Backport the confused-finger-count patch.
+  * Hillariously, dpkg-source ignores deleted files, which means that
+    Xincludes stuff keeps getting resurrected.  Change $(X_INCLUDES_ROOT) to
+    /usr in include paths (except for the server DDK) to ensure that we get
+    the installed headers, not the braindead included ones.
+
+ -- Daniel Stone <[e-mail]>  Wed,  7 Sep 2005 11:07:06 +1000
+
+xorg-driver-synaptics (0.14.3-1ubuntu2) breezy; urgency=low
+
+  * Move to /usr/lib/xorg for the modular server, and build-depend on
+    xserver-xorg-dev.
+  * Switch dependency to xserver-xorg-core, version it.
+  * Start building synaptics_drv.so instead of .o.
+
+ -- Daniel Stone <[e-mail]>  Fri,  2 Sep 2005 12:08:27 +1000
+
+xorg-driver-synaptics (0.14.3-1ubuntu1) breezy; urgency=low
+
+  * Merge with Debian.
+  * New upstream release:
+    + Fixes confused finger count with low pressure on some HPs (closes:
+      Ubuntu#14155).
+  * Remove unnecessary files in Xincludes from x11proto-core-dev and
+    x11proto-input-dev.
+
+ -- Daniel Stone <[e-mail]>  Thu,  1 Sep 2005 16:24:27 +1000
+ 
 xfree86-driver-synaptics (0.14.3-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index b0e4446..f8e828f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: xserver-xorg-input-synaptics
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian X Strike Force <[e-mail]>
 Uploaders: maximilian attems <[e-mail]>
 Build-Depends:
  debhelper-compat (= 12),
diff --git a/debian/gbp.conf b/debian/gbp.conf
 new file mode 100644
index 0000000..b2efa2f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch=ubuntu
+
diff --git a/debian/local/51-synaptics-quirks.conf b/debian/local/51-synaptics-quirks.conf
 new file mode 100644
index 0000000..6587f7a
--- /dev/null
+++ b/debian/local/51-synaptics-quirks.conf
@@ -0,0 +1,23 @@
+Section "InputClass"
+	Identifier "Dell Inspiron embedded buttons quirks"
+	MatchTag "inspiron_1011|inspiron_1012"
+	MatchDevicePath "/dev/input/event*"
+	Driver "synaptics"
+	Option "JumpyCursorThreshold" "90"
+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*"
+	Driver "synaptics"
+	Option "JumpyCursorThreshold" "20"
+EndSection
diff --git a/debian/local/66-xorg-synaptics-quirks.rules b/debian/local/66-xorg-synaptics-quirks.rules
 new file mode 100644
index 0000000..d3af3c4
--- /dev/null
+++ b/debian/local/66-xorg-synaptics-quirks.rules
@@ -0,0 +1,13 @@
+ACTION!="add|change", GOTO="xorg_synaptics_quirks_end"
+KERNEL!="event*", GOTO="xorg_synaptics_quirks_end"
+
+ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_quirks_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_quirks_end"
diff --git a/debian/patches/101_resolution_detect_option.patch b/debian/patches/101_resolution_detect_option.patch
 new file mode 100644
index 0000000..ad7124d
--- /dev/null
+++ b/debian/patches/101_resolution_detect_option.patch
@@ -0,0 +1,153 @@
+From: Ubuntu X-SWAT <[e-mail]>
+Date: Mon, 27 Nov 2023 16:42:01 +0000
+Subject: Provide an option to prevent synaptics from communicating the
+ touchpad size to the xserver.
+
+Bug-Ubuntu: https://launchpad.net/bugs/327428
+---
+ include/synaptics-properties.h |  3 +++
+ man/synaptics.man              | 16 ++++++++++++++++
+ src/properties.c               | 11 +++++++++++
+ src/synaptics.c                |  5 +++--
+ src/synapticsstr.h             |  1 +
+ tools/synclient.c              |  1 +
+ 6 files changed, 35 insertions(+), 2 deletions(-)
+
+diff --git a/include/synaptics-properties.h b/include/synaptics-properties.h
+index a0d7524..f08bc74 100644
+--- a/include/synaptics-properties.h
++++ b/include/synaptics-properties.h
+@@ -133,6 +133,9 @@
+ /* FLOAT, 2 values, min, max */
+ #define SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR "Synaptics Pressure Motion Factor"
+ 
++/* 8 bit (BOOL) */
++#define SYNAPTICS_PROP_RESOLUTION_DETECT "Synaptics Resolution Detect"
++
+ /* 8 bit (BOOL) */
+ #define SYNAPTICS_PROP_GRAB "Synaptics Grab Event Device"
+ 
+diff --git a/man/synaptics.man b/man/synaptics.man
+index 4432f01..9c7bc0e 100644
+--- a/man/synaptics.man
++++ b/man/synaptics.man
+@@ -427,6 +427,18 @@ The gesture is enabled by default and can be disabled by setting the
+ TapAndDragGesture option to false. Property: "Synaptics Gestures"
+ .
+ .TP
++.BI "Option \*ResolutionDetect\*q \*q" boolean \*q
++Allow or prevent the synaptics driver from reporting the size of the
++touchpad to the X server.  The X server normally uses this information
++to scale movements so that touchpad movement corresponds visually to
++mouse cursor movements on the screen.  However, in some rare cases where
++the touchpad height/width ratio is significantly different from the
++laptop, it can cause the mouse cursor to skip pixels in the X or Y axis.
++This option allows disabling this scaling behavior, which can provide
++smoother mouse movement in such cases.
++Property: "Synaptics Resolution Detect"
++.
++.TP
+ .BI "Option \*qVertResolution\*q \*q" integer \*q
+ Resolution of X coordinates in units/millimeter. The value is used
+ together with HorizResolution to compensate unequal vertical and
+@@ -879,6 +891,10 @@ FLOAT, 2 values, speed, friction.
+ .BI "Synaptics Pressure Motion Factor"
+ FLOAT, 2 values, min, max.
+ 
++.TP 7
++.BI "Synaptics Resolution Detect"
++8 bit (BOOL).
++
+ .TP 7
+ .BI "Synaptics Grab Event Device"
+ 8 bit (BOOL).
+diff --git a/src/properties.c b/src/properties.c
+index c776e6c..e4b9d5e 100644
+--- a/src/properties.c
++++ b/src/properties.c
+@@ -85,6 +85,7 @@ Atom prop_palm_dim = 0;
+ Atom prop_coastspeed = 0;
+ Atom prop_pressuremotion = 0;
+ Atom prop_pressuremotion_factor = 0;
++Atom prop_resolution_detect = 0;
+ Atom prop_grab = 0;
+ Atom prop_gestures = 0;
+ Atom prop_capabilities = 0;
+@@ -345,6 +346,10 @@ InitDeviceProperties(InputInfoPtr pInfo)
+         InitFloatAtom(pInfo->dev, SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR, 2,
+                       fvalues);
+ 
++    prop_resolution_detect =
++        InitAtom(pInfo->dev, SYNAPTICS_PROP_RESOLUTION_DETECT, 8, 1,
++                 &para->resolution_detect);
++
+     prop_grab =
+         InitAtom(pInfo->dev, SYNAPTICS_PROP_GRAB, 8, 1,
+                  &para->grab_event_device);
+@@ -747,6 +752,12 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
+         para->press_motion_min_factor = press[0];
+         para->press_motion_max_factor = press[1];
+     }
++    else if (property == prop_resolution_detect) {
++        if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER)
++            return BadMatch;
++
++        para->resolution_detect = *(BOOL*)prop->data;
++    }
+     else if (property == prop_grab) {
+         if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER)
+             return BadMatch;
+diff --git a/src/synaptics.c b/src/synaptics.c
+index 210f954..d1a8a96 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -742,6 +742,7 @@ set_default_parameters(InputInfoPtr pInfo)
+         xf86SetIntOption(opts, "PressureMotionMinZ", pressureMotionMinZ);
+     pars->press_motion_max_z =
+         xf86SetIntOption(opts, "PressureMotionMaxZ", pressureMotionMaxZ);
++    pars->resolution_detect = xf86SetBoolOption(opts, "ResolutionDetect", TRUE);
+ 
+     pars->min_speed = xf86SetRealOption(opts, "MinSpeed", 0.4);
+     pars->max_speed = xf86SetRealOption(opts, "MaxSpeed", 0.7);
+@@ -1290,7 +1291,7 @@ DeviceInit(DeviceIntPtr dev)
+     }
+ 
+     /* X valuator */
+-    if (priv->minx < priv->maxx) {
++    if (priv->minx < priv->maxx && priv->synpara.resolution_detect) {
+         min = priv->minx;
+         max = priv->maxx;
+     }
+@@ -1305,7 +1306,7 @@ DeviceInit(DeviceIntPtr dev)
+     xf86InitValuatorDefaults(dev, 0);
+ 
+     /* Y valuator */
+-    if (priv->miny < priv->maxy) {
++    if (priv->miny < priv->maxy && priv->synpara.resolution_detect) {
+         min = priv->miny;
+         max = priv->maxy;
+     }
+diff --git a/src/synapticsstr.h b/src/synapticsstr.h
+index 7972a9c..fd3a179 100644
+--- a/src/synapticsstr.h
++++ b/src/synapticsstr.h
+@@ -222,6 +222,7 @@ typedef struct _SynapticsParameters {
+     int press_motion_max_z;     /* finger pressure at which maximum pressure motion factor is applied */
+     double press_motion_min_factor;     /* factor applied on speed when finger pressure is at minimum */
+     double press_motion_max_factor;     /* factor applied on speed when finger pressure is at minimum */
++    Bool resolution_detect;     /* report pad size to xserver? */
+     Bool grab_event_device;     /* grab event device for exclusive use? */
+     Bool tap_and_drag_gesture;  /* Switches the tap-and-drag gesture on/off */
+     unsigned int resolution_horiz;      /* horizontal resolution of touchpad in units/mm */
+diff --git a/tools/synclient.c b/tools/synclient.c
+index 13fb812..a290fbf 100644
+--- a/tools/synclient.c
++++ b/tools/synclient.c
+@@ -130,6 +130,7 @@ static struct Parameter params[] = {
+     {"PressureMotionMaxZ",    PT_INT,    1, 255,   SYNAPTICS_PROP_PRESSURE_MOTION,	32,	1},
+     {"PressureMotionMinFactor", PT_DOUBLE, 0, 10.0,SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR,	0 /*float*/,	0},
+     {"PressureMotionMaxFactor", PT_DOUBLE, 0, 10.0,SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR,	0 /*float*/,	1},
++    {"ResolutionDetect",      PT_BOOL,   0, 1,     SYNAPTICS_PROP_RESOLUTION_DETECT,	8,      0},
+     {"GrabEventDevice",       PT_BOOL,   0, 1,     SYNAPTICS_PROP_GRAB,	8,	0},
+     {"TapAndDragGesture",     PT_BOOL,   0, 1,     SYNAPTICS_PROP_GESTURES,	8,	0},
+     {"AreaLeftEdge",          PT_INT, INT_MIN, INT_MAX, SYNAPTICS_PROP_AREA,	32,	0},
diff --git a/debian/patches/103_enable_cornertapping.patch b/debian/patches/103_enable_cornertapping.patch
 new file mode 100644
index 0000000..bffde10
--- /dev/null
+++ b/debian/patches/103_enable_cornertapping.patch
@@ -0,0 +1,25 @@
+From: Ubuntu X-SWAT <[e-mail]>
+Date: Mon, 27 Nov 2023 16:42:01 +0000
+Subject: Enable right/middle clicks by tapping in the bottom- and top-right
+ corners.
+
+Bug-Ubuntu: https://launchpad.net/bugs/320632
+---
+ src/synaptics.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index d1a8a96..981fe7a 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -717,8 +717,8 @@ set_default_parameters(InputInfoPtr pInfo)
+ 
+     pars->locked_drags = xf86SetBoolOption(opts, "LockedDrags", FALSE);
+     pars->locked_drag_time = xf86SetIntOption(opts, "LockedDragTimeout", 5000);
+-    pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 0);
+-    pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 0);
++    pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 2);
++    pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 3);
+     pars->tap_action[LT_TAP] = xf86SetIntOption(opts, "LTCornerButton", 0);
+     pars->tap_action[LB_TAP] = xf86SetIntOption(opts, "LBCornerButton", 0);
+     pars->tap_action[F1_TAP] = xf86SetIntOption(opts, "TapButton1", tapButton1);
diff --git a/debian/patches/104_always_enable_tapping.patch b/debian/patches/104_always_enable_tapping.patch
 new file mode 100644
index 0000000..ce07f58
--- /dev/null
+++ b/debian/patches/104_always_enable_tapping.patch
@@ -0,0 +1,28 @@
+From: Ubuntu X-SWAT <[e-mail]>
+Date: Mon, 27 Nov 2023 16:42:01 +0000
+Subject: Enable tapping even when a physical left button is available.
+
+Bug-Ubuntu: https://launchpad.net/bugs/320585
+---
+ src/synaptics.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index 981fe7a..eada4af 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -622,10 +622,10 @@ set_default_parameters(InputInfoPtr pInfo)
+     palmMinWidth = priv->minw + range * (10.0 / 16);
+     emulateTwoFingerMinW = priv->minw + range * (7.0 / 16);
+ 
+-    /* Enable tap if we don't have a phys left button */
+-    tapButton1 = priv->has_left ? 0 : 1;
+-    tapButton2 = priv->has_left ? 0 : 3;
+-    tapButton3 = priv->has_left ? 0 : 2;
++    /* Enable tap */
++    tapButton1 = 1;
++    tapButton2 = 3;
++    tapButton3 = 2;
+ 
+     /* Enable multifinger-click if only have one physical button,
+        otherwise clickFinger is always button 1. */
diff --git a/debian/patches/106_always_enable_vert_edge_scroll.patch b/debian/patches/106_always_enable_vert_edge_scroll.patch
 new file mode 100644
index 0000000..6dc5d38
--- /dev/null
+++ b/debian/patches/106_always_enable_vert_edge_scroll.patch
@@ -0,0 +1,25 @@
+From: Ubuntu X-SWAT <[e-mail]>
+Date: Mon, 27 Nov 2023 16:42:01 +0000
+Subject: Enable vertical edge tapping by default even if we enable two-finger
+ scrolling as well.
+
+Bug-Ubuntu: https://launchpad.net/bugs/320632
+---
+ src/synaptics.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index eada4af..d243622 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -633,8 +633,8 @@ set_default_parameters(InputInfoPtr pInfo)
+     clickFinger2 = (priv->has_right || priv->has_middle) ? 1 : 3;
+     clickFinger3 = (priv->has_right || priv->has_middle) ? 1 : 2;
+ 
+-    /* Enable vert edge scroll if we can't detect doubletap */
+-    vertEdgeScroll = priv->has_double ? FALSE : TRUE;
++    /* Enable vert edge scroll */
++    vertEdgeScroll = TRUE;
+     horizEdgeScroll = FALSE;
+ 
+     /* Enable twofinger scroll if we can detect doubletap */
diff --git a/debian/patches/115_evdev_only.patch b/debian/patches/115_evdev_only.patch
 new file mode 100644
index 0000000..108a9ce
--- /dev/null
+++ b/debian/patches/115_evdev_only.patch
@@ -0,0 +1,23 @@
+From: Ubuntu X-SWAT <[e-mail]>
+Date: Mon, 27 Nov 2023 16:42:01 +0000
+Subject: Prevent non-evdev devices from firing the eventcomm AutoDevProbe
+ callback.
+
+Bug-Ubuntu: https://launchpad.net/bugs/624985
+---
+ conf/70-synaptics.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf/70-synaptics.conf b/conf/70-synaptics.conf
+index aa50456..eb01774 100644
+--- a/conf/70-synaptics.conf
++++ b/conf/70-synaptics.conf
+@@ -14,7 +14,7 @@ Section "InputClass"
+ # This option is recommend on all Linux systems using evdev, but cannot be
+ # enabled by default. See the following link for details:
+ # http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
+-#       MatchDevicePath "/dev/input/event*"
++      MatchDevicePath "/dev/input/event*"
+ EndSection
+ 
+ Section "InputClass"
diff --git a/debian/patches/118_quell_error_msg.patch b/debian/patches/118_quell_error_msg.patch
 new file mode 100644
index 0000000..6d38265
--- /dev/null
+++ b/debian/patches/118_quell_error_msg.patch
@@ -0,0 +1,41 @@
+From: Ubuntu X-SWAT <[e-mail]>
+Date: Mon, 27 Nov 2023 16:42:01 +0000
+Subject: Don't print error "Unable to find a synaptics device" when used on
+ system that doesn't have a touchpad anyway.
+
+Bug-Ubuntu: https://launchpad.net/bugs/716712
+---
+ tools/synclient.c | 4 +---
+ tools/syndaemon.c | 4 +---
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/tools/synclient.c b/tools/synclient.c
+index a290fbf..5b229a1 100644
+--- a/tools/synclient.c
++++ b/tools/synclient.c
+@@ -298,9 +298,7 @@ dp_get_device(Display * dpy)
+  unwind:
+     XFree(properties);
+     XFreeDeviceList(info);
+-    if (!dev)
+-        fprintf(stderr, "Unable to find a synaptics device.\n");
+-    else if (error && dev) {
++    if (error && dev) {
+         XCloseDevice(dpy, dev);
+         dev = NULL;
+     }
+diff --git a/tools/syndaemon.c b/tools/syndaemon.c
+index 575bc6c..bac11d9 100644
+--- a/tools/syndaemon.c
++++ b/tools/syndaemon.c
+@@ -553,9 +553,7 @@ dp_get_device(Display * dpy)
+  unwind:
+     XFree(properties);
+     XFreeDeviceList(info);
+-    if (!dev)
+-        fprintf(stderr, "Unable to find a synaptics device.\n");
+-    else if (error && dev) {
++    if (error && dev) {
+         XCloseDevice(dpy, dev);
+         dev = NULL;
+     }
diff --git a/debian/patches/124_syndaemon_events.patch b/debian/patches/124_syndaemon_events.patch
 new file mode 100644
index 0000000..a375a58
--- /dev/null
+++ b/debian/patches/124_syndaemon_events.patch
@@ -0,0 +1,40 @@
+From: Chase Douglas <[e-mail]>
+Date: Fri, 15 Apr 2011 15:23:17 -0400
+Subject: [PATCH xf86-input-synaptics] Drain XRecord connection of any events
+ after handling replies
+
+If the X server sends an event to the XRecord connection the event
+will never be handled. This will cause the event queue to fill up in
+Xlib and lead to syndaemon running away at 100% cpu usage.
+
+This change drains any events from the connection. It's not a fix for
+the underlying bug in the server or Xlib, but it does paper over the
+issue for now.
+
+https://bugs.launchpad.net/bugs/754470
+http://bugs.freedesktop.org/show_bug.cgi?id=31921
+
+Signed-off-by: Chase Douglas <[e-mail]>
+---
+ tools/syndaemon.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/tools/syndaemon.c b/tools/syndaemon.c
+index bac11d9..cd75f4e 100644
+--- a/tools/syndaemon.c
++++ b/tools/syndaemon.c
+@@ -466,6 +466,14 @@ record_main_loop(Display * display, double idle_time)
+                         event.type);
+             }
+ 
++            /* If there are any events left over, they are in error. Drain them
++             * from the connection queue so we don't get stuck. */
++            while (XEventsQueued(dpy_data, QueuedAlready) > 0) {
++                XEvent event;
++                XNextEvent(dpy_data, &event);
++                fprintf(stderr, "bad event received, major opcode %d\n", event.type);
++            }
++
+             if (!ignore_modifier_keys && cbres.key_event) {
+                 disable_event = 1;
+             }
diff --git a/debian/patches/128_disable_three_click_action.patch b/debian/patches/128_disable_three_click_action.patch
 new file mode 100644
index 0000000..3567280
--- /dev/null
+++ b/debian/patches/128_disable_three_click_action.patch
@@ -0,0 +1,22 @@
+From: Ubuntu X-SWAT <[e-mail]>
+Date: Mon, 27 Nov 2023 16:42:01 +0000
+Subject: Disable three touch click in favor of uTouch gestures.
+
+Bug-Ubuntu: https://launchpad.net/bugs/961725
+---
+ src/synaptics.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index d243622..e967904 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -631,7 +631,7 @@ set_default_parameters(InputInfoPtr pInfo)
+        otherwise clickFinger is always button 1. */
+     clickFinger1 = 1;
+     clickFinger2 = (priv->has_right || priv->has_middle) ? 1 : 3;
+-    clickFinger3 = (priv->has_right || priv->has_middle) ? 1 : 2;
++    clickFinger3 = 0; /* Disabled by default so three-touch gestures work */
+ 
+     /* Enable vert edge scroll */
+     vertEdgeScroll = TRUE;
diff --git a/debian/patches/129_disable_three_touch_tap.patch b/debian/patches/129_disable_three_touch_tap.patch
 new file mode 100644
index 0000000..ba049de
--- /dev/null
+++ b/debian/patches/129_disable_three_touch_tap.patch
@@ -0,0 +1,22 @@
+From: Ubuntu X-SWAT <[e-mail]>
+Date: Mon, 27 Nov 2023 16:42:01 +0000
+Subject: Disable three touch tap in favor of uTouch gestures.
+
+Bug-Ubuntu: https://launchpad.net/bugs/961725
+---
+ src/synaptics.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index e967904..a913f72 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -625,7 +625,7 @@ set_default_parameters(InputInfoPtr pInfo)
+     /* Enable tap */
+     tapButton1 = 1;
+     tapButton2 = 3;
+-    tapButton3 = 2;
++    tapButton3 = 0; /* Disabled by default so three-touch gestures work */
+ 
+     /* Enable multifinger-click if only have one physical button,
+        otherwise clickFinger is always button 1. */
diff --git a/debian/patches/series b/debian/patches/series
index e3f1d64..33a1f81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,11 @@
 02-do-not-use-synaptics-for-keyboards.patch
 03-bug-return-val.patch
+101_resolution_detect_option.patch
+103_enable_cornertapping.patch
+104_always_enable_tapping.patch
+106_always_enable_vert_edge_scroll.patch
+115_evdev_only.patch
+118_quell_error_msg.patch
+124_syndaemon_events.patch
+128_disable_three_click_action.patch
+129_disable_three_touch_tap.patch
diff --git a/debian/xserver-xorg-input-synaptics.install b/debian/xserver-xorg-input-synaptics.install
index 0835787..9e72614 100644
--- a/debian/xserver-xorg-input-synaptics.install
+++ b/debian/xserver-xorg-input-synaptics.install
@@ -2,3 +2,5 @@ usr/lib/xorg/modules/input/*.so
 usr/bin/*
 usr/share/man
 usr/share/X11
+debian/local/51-synaptics-quirks.conf	usr/share/X11/xorg.conf.d
+debian/local/66-xorg-synaptics-quirks.rules	lib/udev/rules.d