conf/50-synaptics.conf | 46 ---------------------------------------------- conf/70-synaptics.conf | 46 ++++++++++++++++++++++++++++++++++++++++++++++ conf/Makefile.am | 2 +- debian/changelog | 9 +++++++++ debian/control | 34 ---------------------------------- debian/rules | 2 +- man/synaptics.man | 2 +- 7 files changed, 58 insertions(+), 83 deletions(-)
New commits: commit 979144255c1e99d8d1cb750822d45d2c95c2166e Author: Emilio Pozuelo Monfort <[email protected]> Date: Thu May 26 18:32:58 2016 +0200 Release to unstable diff --git a/debian/changelog b/debian/changelog index d056775..aa06597 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xserver-xorg-input-synaptics (1.8.3-2) UNRELEASED; urgency=medium +xserver-xorg-input-synaptics (1.8.3-2) unstable; urgency=medium * Cherry-pick upstream commit 59e5db, which renames 50-synaptics.conf to 70-synaptics.conf. This means the synaptic driver will be used instead of the libinput driver when both are installed. * Drop dbg package in favor of the dbgsym. - -- Emilio Pozuelo Monfort <[email protected]> Thu, 26 May 2016 18:12:30 +0200 + -- Emilio Pozuelo Monfort <[email protected]> Thu, 26 May 2016 18:32:56 +0200 xserver-xorg-input-synaptics (1.8.3-1) unstable; urgency=medium commit 21b12677c1e21750fe8719c67966a346598e4f71 Author: Emilio Pozuelo Monfort <[email protected]> Date: Thu May 26 18:30:49 2016 +0200 Drop dbg package in favor of the dbgsym diff --git a/debian/changelog b/debian/changelog index a49b68d..d056775 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-input-synaptics (1.8.3-2) UNRELEASED; urgency=medium * Cherry-pick upstream commit 59e5db, which renames 50-synaptics.conf to 70-synaptics.conf. This means the synaptic driver will be used instead of the libinput driver when both are installed. + * Drop dbg package in favor of the dbgsym. -- Emilio Pozuelo Monfort <[email protected]> Thu, 26 May 2016 18:12:30 +0200 diff --git a/debian/control b/debian/control index 9a4f8b9..531e14d 100644 --- a/debian/control +++ b/debian/control @@ -68,37 +68,3 @@ Description: Synaptics TouchPad driver for X.Org server (development headers) This package contains the development headers for the Synaptics input driver found in xserver-xorg-input-synaptics. Non-developers likely have little use for this package. - -Package: xserver-xorg-input-synaptics-dbg -Architecture: linux-any -Depends: - ${misc:Depends}, - xserver-xorg-input-synaptics (= ${binary:Version}), -Section: debug -Priority: extra -Description: Synaptics TouchPad driver for X.Org server - This package provides an input driver for the X.Org X server to enable - advanced features of the Synaptics Touchpad including: - . - * Movement with adjustable, non-linear acceleration and speed - * Button events through short touching of the touchpad - * Double-Button events through double short touching of the touchpad - * Dragging through short touching and holding down the finger on the touchpad - * Middle and right button events on the upper and lower corner of the touchpad - * Vertical scrolling (button four and five events) through moving the finger - on the right side of the touchpad - * The up/down button sends button four/five events - * Horizontal scrolling (button six and seven events) through moving the finger - on the lower side of the touchpad - * The multi-buttons send button four/five events, and six/seven events for - horizontal scrolling - * Adjustable finger detection - * Multifinger taps: two finger for middle button and three finger for right - button events. (Needs hardware support. Not all models implement this - feature.) - * Run-time configuration using shared memory. This means you can change - parameter settings without restarting the X server (see synclient(1)). - * It also provides a daemon to disable touchpad while typing at the keyboard - and thus avoid unwanted mouse movements (see syndaemon(1)). - . - This package provides debugging symbols for this Xorg X driver. diff --git a/debian/rules b/debian/rules index 29f61aa..c77b5bf 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ override_dh_shlibdeps: # Debug package: override_dh_strip: - dh_strip --dbg-package=xserver-xorg-input-synaptics-dbg + dh_strip --dbgsym-migration='xserver-xorg-input-synaptics-dbg (<< 1.8.3-2~)' override_dh_auto_configure: dh_auto_configure -- \ commit 68cd59fc09440c5437175d83564b2ba7edf7d219 Author: Emilio Pozuelo Monfort <[email protected]> Date: Thu May 26 18:15:08 2016 +0200 Add changelog entry diff --git a/debian/changelog b/debian/changelog index c5b4136..a49b68d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-input-synaptics (1.8.3-2) UNRELEASED; urgency=medium + + * Cherry-pick upstream commit 59e5db, which renames 50-synaptics.conf + to 70-synaptics.conf. This means the synaptic driver will be used + instead of the libinput driver when both are installed. + + -- Emilio Pozuelo Monfort <[email protected]> Thu, 26 May 2016 18:12:30 +0200 + xserver-xorg-input-synaptics (1.8.3-1) unstable; urgency=medium * New upstream release. commit ca44e3fbf8271712db94bf8f38e363f34b7e33af Author: Stefan Dirsch <[email protected]> Date: Thu May 19 17:35:57 2016 +0200 conf: rename to 70-synaptics.conf Bump up the synaptics driver to 70, so it get's preferred over libinput, which was dropped down to 60. The synaptics driver is more of a leaf package than libinput (which covers a multitude of device types) and can be removed by default. When specifically installed by the user, the synaptics driver should override the system default. Similar to what was done for wacom configuration file. https://bugzilla.suse.com/show_bug.cgi?id=979554 Signed-off-by: Stefan Dirsch <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf deleted file mode 100644 index aa50456..0000000 --- a/conf/50-synaptics.conf +++ /dev/null @@ -1,46 +0,0 @@ -# Example xorg.conf.d snippet that assigns the touchpad driver -# to all touchpads. See xorg.conf.d(5) for more information on -# InputClass. -# DO NOT EDIT THIS FILE, your distribution will likely overwrite -# it when updating. Copy (and rename) this file into -# /etc/X11/xorg.conf.d first. -# Additional options may be added in the form of -# Option "OptionName" "value" -# -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" -# 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*" -EndSection - -Section "InputClass" - Identifier "touchpad ignore duplicates" - MatchIsTouchpad "on" - MatchOS "Linux" - MatchDevicePath "/dev/input/mouse*" - Option "Ignore" "on" -EndSection - -# This option enables the bottom right corner to be a right button on clickpads -# and the right and middle top areas to be right / middle buttons on clickpads -# with a top button area. -# This option is only interpreted by clickpads. -Section "InputClass" - Identifier "Default clickpad buttons" - MatchDriver "synaptics" - Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0" - Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%" -EndSection - -# This option disables software buttons on Apple touchpads. -# This option is only interpreted by clickpads. -Section "InputClass" - Identifier "Disable clickpad buttons on Apple touchpads" - MatchProduct "Apple|bcm5974" - MatchDriver "synaptics" - Option "SoftButtonAreas" "0 0 0 0 0 0 0 0" -EndSection diff --git a/conf/70-synaptics.conf b/conf/70-synaptics.conf new file mode 100644 index 0000000..aa50456 --- /dev/null +++ b/conf/70-synaptics.conf @@ -0,0 +1,46 @@ +# Example xorg.conf.d snippet that assigns the touchpad driver +# to all touchpads. See xorg.conf.d(5) for more information on +# InputClass. +# DO NOT EDIT THIS FILE, your distribution will likely overwrite +# it when updating. Copy (and rename) this file into +# /etc/X11/xorg.conf.d first. +# Additional options may be added in the form of +# Option "OptionName" "value" +# +Section "InputClass" + Identifier "touchpad catchall" + Driver "synaptics" + MatchIsTouchpad "on" +# 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*" +EndSection + +Section "InputClass" + Identifier "touchpad ignore duplicates" + MatchIsTouchpad "on" + MatchOS "Linux" + MatchDevicePath "/dev/input/mouse*" + Option "Ignore" "on" +EndSection + +# This option enables the bottom right corner to be a right button on clickpads +# and the right and middle top areas to be right / middle buttons on clickpads +# with a top button area. +# This option is only interpreted by clickpads. +Section "InputClass" + Identifier "Default clickpad buttons" + MatchDriver "synaptics" + Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0" + Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%" +EndSection + +# This option disables software buttons on Apple touchpads. +# This option is only interpreted by clickpads. +Section "InputClass" + Identifier "Disable clickpad buttons on Apple touchpads" + MatchProduct "Apple|bcm5974" + MatchDriver "synaptics" + Option "SoftButtonAreas" "0 0 0 0 0 0 0 0" +EndSection diff --git a/conf/Makefile.am b/conf/Makefile.am index 38d2a01..b883c10 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -20,7 +20,7 @@ if HAS_XORG_CONF_DIR -dist_config_DATA = 50-synaptics.conf +dist_config_DATA = 70-synaptics.conf else fdidir = $(datadir)/hal/fdi/policy/20thirdparty dist_fdi_DATA = 11-x11-synaptics.fdi diff --git a/man/synaptics.man b/man/synaptics.man index 76756be..026e263 100644 --- a/man/synaptics.man +++ b/man/synaptics.man @@ -924,7 +924,7 @@ Configuration through .I InputClass sections is recommended in X servers 1.8 and later. See xorg.conf.d(5) for more details. An example xorg.conf.d snippet is provided in -.I ${sourcecode}/conf/50-synaptics.conf +.I ${sourcecode}/conf/70-synaptics.conf .LP Configuration through hal fdi files is recommended in X servers 1.5, 1.6 and 1.7. An example hal policy file is provided in
