Makefile.am | 2 conf/11-x11-synaptics.fdi | 31 ++++++++++++ conf/50-synaptics.conf | 5 + conf/Makefile.am | 29 +++++++++++ configure.ac | 10 +++ debian/README.source | 2 debian/changelog | 33 +++++++++++++ debian/control | 9 +-- debian/local/10-synaptics.conf | 23 --------- debian/local/51-synaptics-quirks.conf | 16 ++++++ debian/patches/02-do-not-use-synaptics-for-keyboards.patch | 6 +- debian/rules | 10 +-- debian/xserver-xorg-input-synaptics.install | 2 debian/xserver-xorg-input-synaptics.manpages | 2 debian/xsfbs/xsfbs.mk | 31 +++++++----- fdi/11-x11-synaptics.fdi | 31 ------------ fdi/Makefile.am | 21 -------- 17 files changed, 157 insertions(+), 106 deletions(-)
New commits: commit f7962d0fba9e250498f5e262ad390cb396261860 Author: Robert Hooker <sarv...@ubuntu.com> Date: Mon May 31 07:59:41 2010 -0400 Update changelog. diff --git a/debian/changelog b/debian/changelog index 8755bfb..d431c65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +xserver-xorg-input-synaptics (1.2.2-2ubuntu1) UNRELEASED; urgency=low + + * 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. + + -- Robert Hooker <sarv...@ubuntu.com> Mon, 31 May 2010 07:50:04 -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. commit 39ac19e68f421596fc54603ca68f31be8f008d5f Author: Cyril Brulebois <k...@debian.org> Date: Sat Apr 17 17:48:38 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index d0b08df..3fcc442 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low +xserver-xorg-input-synaptics (1.2.2-2) unstable; urgency=low * Cherry-pick patch from upstream git to add the xorg.conf.d snippet. * Replace our local copy with that one. @@ -13,7 +13,7 @@ xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low * Add myself to Uploaders. * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). - -- Julien Cristau <jcris...@debian.org> Thu, 01 Apr 2010 14:40:18 +0300 + -- Cyril Brulebois <k...@debian.org> Sat, 17 Apr 2010 17:48:26 +0200 xserver-xorg-input-synaptics (1.2.2-1) unstable; urgency=low commit c05d56d0810c989b5ae379b085110f6397ecb042 Author: Cyril Brulebois <k...@debian.org> Date: Sat Apr 17 17:48:18 2010 +0200 Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). diff --git a/debian/changelog b/debian/changelog index 1fe7de6..d0b08df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low [ Cyril Brulebois ] * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). -- Julien Cristau <jcris...@debian.org> Thu, 01 Apr 2010 14:40:18 +0300 diff --git a/debian/control b/debian/control index 1499438..d13dc3a 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: automake, libtool, xutils-dev, -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git commit bb15e45ca4c8a65abed48754040713753e59f2cb Author: Cyril Brulebois <k...@debian.org> Date: Sat Apr 17 17:44:59 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 5a8017b..1fe7de6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low * Update to new xsfbs, use ${xinpdriver:Depends} in debian/control. * Drop dependency on udev, since we have no udev rules or trigger. + [ Cyril Brulebois ] + * Add myself to Uploaders. + -- Julien Cristau <jcris...@debian.org> Thu, 01 Apr 2010 14:40:18 +0300 xserver-xorg-input-synaptics (1.2.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 391c16c..1499438 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-input-synaptics Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: Mattia Dongili <malat...@debian.org> +Uploaders: Mattia Dongili <malat...@debian.org>, Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), libx11-dev, commit 6b9a7ee9530ac24ec95573ecb442450c1be940ed Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 22:27:27 2010 +0200 Drop dependency on udev, since we have no udev rules or trigger. diff --git a/debian/changelog b/debian/changelog index 6e3ca67..5a8017b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low * Drop postinst, we don't need to trigger udev anymore. * Sanitize installation of manpage into the package. * Update to new xsfbs, use ${xinpdriver:Depends} in debian/control. + * Drop dependency on udev, since we have no udev rules or trigger. -- Julien Cristau <jcris...@debian.org> Thu, 01 Apr 2010 14:40:18 +0300 diff --git a/debian/control b/debian/control index 1ed04da..391c16c 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synapti Package: xserver-xorg-input-synaptics Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc sh4 sparc Depends: - udev [linux-any], ${shlibs:Depends}, ${xinpdriver:Depends}, ${misc:Depends} commit 67ca7b7df516db1efd274d3a4cbd08a345ac0e07 Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 22:23:11 2010 +0200 Actually install the xorg.conf.d snippet in the package diff --git a/debian/xserver-xorg-input-synaptics.install b/debian/xserver-xorg-input-synaptics.install index 9f95e37..0835787 100644 --- a/debian/xserver-xorg-input-synaptics.install +++ b/debian/xserver-xorg-input-synaptics.install @@ -1,3 +1,4 @@ usr/lib/xorg/modules/input/*.so usr/bin/* usr/share/man +usr/share/X11 commit 4f63eb97f7a63548ebc7f45ef8b8e73af3020a71 Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 22:21:51 2010 +0200 Fix patch 02 to apply after fdi -> conf move. diff --git a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch index 890a444..a756a5d 100644 --- a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch +++ b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch @@ -1,10 +1,10 @@ do not use the synaptics driver for devices advertising themselves as keyboards http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524130 -Index: xserver-xorg-input-synaptics/fdi/11-x11-synaptics.fdi +Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi =================================================================== ---- xserver-xorg-input-synaptics.orig/fdi/11-x11-synaptics.fdi 2009-11-21 13:15:39.064182104 +0900 -+++ xserver-xorg-input-synaptics/fdi/11-x11-synaptics.fdi 2009-11-21 13:16:23.404256090 +0900 +--- xserver-xorg-input-synaptics.orig/conf/11-x11-synaptics.fdi 2009-11-21 13:15:39.064182104 +0900 ++++ xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi 2009-11-21 13:16:23.404256090 +0900 @@ -2,30 +2,34 @@ <deviceinfo version="0.2"> <device> commit d68c932a1f18ff74ade7bcd45393c1e3aa87b701 Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 22:20:41 2010 +0200 Update to new xsfbs, use ${xinpdriver:Depends} in debian/control. diff --git a/debian/changelog b/debian/changelog index c1c87c8..6e3ca67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low /usr/share/X11/xorg.conf.d. * Drop postinst, we don't need to trigger udev anymore. * Sanitize installation of manpage into the package. + * Update to new xsfbs, use ${xinpdriver:Depends} in debian/control. -- Julien Cristau <jcris...@debian.org> Thu, 01 Apr 2010 14:40:18 +0300 diff --git a/debian/control b/debian/control index aba8012..1ed04da 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-amd6 Depends: udev [linux-any], ${shlibs:Depends}, - ${xserver:Depends}, + ${xinpdriver:Depends}, ${misc:Depends} Conflicts: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics Replaces: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 9eee5ce1fc0fde276e6849f36c9c53bbe1b91f9c Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 18:59:42 2010 +0200 Sanitize installation of manpage into the package. diff --git a/debian/changelog b/debian/changelog index daaa732..c1c87c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low * Build-Depend on new xserver-xorg-dev, which lets us install the snippet to /usr/share/X11/xorg.conf.d. * Drop postinst, we don't need to trigger udev anymore. + * Sanitize installation of manpage into the package. -- Julien Cristau <jcris...@debian.org> Thu, 01 Apr 2010 14:40:18 +0300 diff --git a/debian/rules b/debian/rules index dd52fe6..a24369b 100755 --- a/debian/rules +++ b/debian/rules @@ -86,7 +86,7 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog - dh_install --sourcedir=debian/tmp --list-missing --exclude=synaptics_drv.la --exclude=usr/share/man + dh_install --sourcedir=debian/tmp --list-missing --exclude=synaptics_drv.la dh_installman dh_link dh_strip diff --git a/debian/xserver-xorg-input-synaptics.install b/debian/xserver-xorg-input-synaptics.install index f897163..9f95e37 100644 --- a/debian/xserver-xorg-input-synaptics.install +++ b/debian/xserver-xorg-input-synaptics.install @@ -1,2 +1,3 @@ usr/lib/xorg/modules/input/*.so usr/bin/* +usr/share/man diff --git a/debian/xserver-xorg-input-synaptics.manpages b/debian/xserver-xorg-input-synaptics.manpages deleted file mode 100644 index d959805..0000000 --- a/debian/xserver-xorg-input-synaptics.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/man/man1/* -debian/tmp/usr/share/man/man4/* commit 582088b7e9e165a6bf44a49506f81bff027099af Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 18:55:23 2010 +0200 Drop postinst, we don't need to trigger udev anymore. diff --git a/debian/changelog b/debian/changelog index c69ab23..daaa732 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low * Replace our local copy with that one. * Build-Depend on new xserver-xorg-dev, which lets us install the snippet to /usr/share/X11/xorg.conf.d. + * Drop postinst, we don't need to trigger udev anymore. -- Julien Cristau <jcris...@debian.org> Thu, 01 Apr 2010 14:40:18 +0300 diff --git a/debian/xserver-xorg-input-synaptics.postinst.in b/debian/xserver-xorg-input-synaptics.postinst.in deleted file mode 100644 index aea2faa..0000000 --- a/debian/xserver-xorg-input-synaptics.postinst.in +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -set -e - -THIS_PACKAGE=xserver-xorg-input-synaptics -THIS_SCRIPT=postinst - -#INCLUDE_SHELL_LIB# - -case "$1" in - configure) - if dpkg --compare-versions "$2" lt 1.2.0-4; then - if [ `uname -s` = "Linux" ]; then - udevadm trigger --subsystem-match=input --action=change - fi - fi -esac - -#DEBHELPER# - -exit 0 - -# vim:set ai et sw=2 ts=2 tw=80: commit d86522fbc7a2aa0a85ca879c194eaa1e497f8385 Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 18:53:07 2010 +0200 Update the xorg.conf.d stuff * Cherry-pick patch from upstream git to add the xorg.conf.d snippet. * Replace our local copy with that one. * Build-Depend on new xserver-xorg-dev, which lets us install the snippet to /usr/share/X11/xorg.conf.d. diff --git a/debian/changelog b/debian/changelog index 337a1ab..c69ab23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low - * 10-synaptics.conf: Use 'MatchDevicePath "/dev/input/event*"'. + * Cherry-pick patch from upstream git to add the xorg.conf.d snippet. + * Replace our local copy with that one. + * Build-Depend on new xserver-xorg-dev, which lets us install the snippet to + /usr/share/X11/xorg.conf.d. - -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 01 Apr 2010 14:40:18 +0300 + -- Julien Cristau <jcris...@debian.org> Thu, 01 Apr 2010 14:40:18 +0300 xserver-xorg-input-synaptics (1.2.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 45d4a41..aba8012 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: libxext-dev, libxi-dev (>= 2:1.2.0), x11proto-core-dev, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), pkg-config, quilt, automake, diff --git a/debian/local/10-synaptics.conf b/debian/local/10-synaptics.conf deleted file mode 100644 index fb22e7d..0000000 --- a/debian/local/10-synaptics.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "touchpad catchall" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Driver "synaptics" -EndSection diff --git a/debian/local/66-xorg-synaptics.rules b/debian/local/66-xorg-synaptics.rules deleted file mode 100644 index f4d5069..0000000 --- a/debian/local/66-xorg-synaptics.rules +++ /dev/null @@ -1,10 +0,0 @@ -ACTION!="add|change", GOTO="xorg_synaptics_end" -KERNEL!="event*", GOTO="xorg_synaptics_end" - -ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end" - -# Placeholder for platform specific quirks needing -# ID_INPUT.tags to be set. - - -LABEL="xorg_synaptics_end" diff --git a/debian/rules b/debian/rules index 6e5b476..dd52fe6 100755 --- a/debian/rules +++ b/debian/rules @@ -87,16 +87,6 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp --list-missing --exclude=synaptics_drv.la --exclude=usr/share/man -ifeq ($(DEB_HOST_ARCH_OS), linux) - install -d debian/xserver-xorg-input-synaptics/lib/udev/rules.d - install -m 644 debian/local/66-xorg-synaptics.rules debian/xserver-xorg-input-synaptics/lib/udev/rules.d - install -d debian/xserver-xorg-input-synaptics/usr/lib/X11/xorg.conf.d - install -m 644 debian/local/10-synaptics.conf debian/xserver-xorg-input-synaptics/usr/lib/X11/xorg.conf.d -else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) - install -d debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty - install -m 0644 fdi/11-x11-synaptics.fdi \ - debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty -endif dh_installman dh_link dh_strip commit 231721e69a4e6f067dd7766a50f86ee6b384a7a1 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu Apr 8 14:47:08 2010 +1000 Add 50-synaptics.conf snippet. If the server exports the sysconfigdir variable, install the 50-synaptics.conf snippet in the directory provided. This patch also moves the fdi file from fdi/ into the new conf/ subdir to have a single location for all config files. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Dan Nicholson <dbn.li...@gmail.com> [jcristau: cherry-picked from 87b29e6004a9a7f744eb6e9c2bf9539579ecefbf, with Makefile.am conflict fixed] diff --git a/Makefile.am b/Makefile.am index ad69d2a..72dbf09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AUTOMAKE_OPTIONS = foreign -SUBDIRS = include src man tools fdi +SUBDIRS = include src man tools conf pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-synaptics.pc diff --git a/conf/11-x11-synaptics.fdi b/conf/11-x11-synaptics.fdi new file mode 100644 index 0000000..46ad7b9 --- /dev/null +++ b/conf/11-x11-synaptics.fdi @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<deviceinfo version="0.2"> + <device> + <match key="info.capabilities" contains="input.touchpad"> + <merge key="input.x11_driver" type="string">synaptics</merge> + <!-- Arbitrary options can be passed to the driver using + the input.x11_options property since xorg-server-1.5. --> + <!-- EXAMPLES: + Switch on shared memory, enables the driver to be configured at runtime + <merge key="input.x11_options.SHMConfig" type="string">true</merge> + + Maximum movement of the finger for detecting a tap + <merge key="input.x11_options.MaxTapMove" type="string">2000</merge> + + Enable vertical scrolling when dragging along the right edge + <merge key="input.x11_options.VertEdgeScroll" type="string">true</merge> + + Enable vertical scrolling when dragging with two fingers anywhere on the touchpad + <merge key="input.x11_options.VertTwoFingerScroll" type="string">true</merge> + + Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad + <merge key="input.x11_options.HorizTwoFingerScroll" type="string">true</merge> + + If on, circular scrolling is used + <merge key="input.x11_options.CircularScrolling" type="string">true</merge> + + For other possible options, check CONFIGURATION DETAILS in synaptics man page + --> + </match> + </device> +</deviceinfo> diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf new file mode 100644 index 0000000..89bb557 --- /dev/null +++ b/conf/50-synaptics.conf @@ -0,0 +1,5 @@ +Section "InputClass" + Identifier "touchpad catchall" + Driver "synaptics" + MatchIsTouchpad "on" +EndSection diff --git a/conf/Makefile.am b/conf/Makefile.am new file mode 100644 index 0000000..9a88895 --- /dev/null +++ b/conf/Makefile.am @@ -0,0 +1,29 @@ +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +if HAS_XORG_CONF_DIR +confdir = $(XORG_CONF_DIR) +dist_conf_DATA = 50-synaptics.conf +else + +EXTRA_DIST = 11-x11-synaptics.fdi + +endif diff --git a/configure.ac b/configure.ac index dd2bef7..0482151 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,14 @@ fi AM_CONDITIONAL(BUILD_TOOLS, [ test "$BUILD_TOOLS" = "yes" ]) AC_SUBST(BUILD_TOOLS) +AC_ARG_WITH(xorg-conf-dir, + AC_HELP_STRING([--with-xorg-conf-dir=DIR], + [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]), + [XORG_CONF_DIR="$withval"], + [XORG_CONF_DIR="`$PKG_CONFIG --variable=sysconfigdir xorg-server`"]) +AC_SUBST(XORG_CONF_DIR) +AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$XORG_CONF_DIR" != "x" && test "x$XORG_CONF_DIR" != "xno"]) + # Checks for header files. AC_HEADER_STDC @@ -137,6 +145,6 @@ AC_OUTPUT([Makefile src/Makefile man/Makefile tools/Makefile - fdi/Makefile + conf/Makefile include/Makefile xorg-synaptics.pc]) diff --git a/fdi/11-x11-synaptics.fdi b/fdi/11-x11-synaptics.fdi deleted file mode 100644 index 46ad7b9..0000000 --- a/fdi/11-x11-synaptics.fdi +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<deviceinfo version="0.2"> - <device> - <match key="info.capabilities" contains="input.touchpad"> - <merge key="input.x11_driver" type="string">synaptics</merge> - <!-- Arbitrary options can be passed to the driver using - the input.x11_options property since xorg-server-1.5. --> - <!-- EXAMPLES: - Switch on shared memory, enables the driver to be configured at runtime - <merge key="input.x11_options.SHMConfig" type="string">true</merge> - - Maximum movement of the finger for detecting a tap - <merge key="input.x11_options.MaxTapMove" type="string">2000</merge> - - Enable vertical scrolling when dragging along the right edge - <merge key="input.x11_options.VertEdgeScroll" type="string">true</merge> - - Enable vertical scrolling when dragging with two fingers anywhere on the touchpad - <merge key="input.x11_options.VertTwoFingerScroll" type="string">true</merge> - - Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad - <merge key="input.x11_options.HorizTwoFingerScroll" type="string">true</merge> - - If on, circular scrolling is used - <merge key="input.x11_options.CircularScrolling" type="string">true</merge> - - For other possible options, check CONFIGURATION DETAILS in synaptics man page - --> - </match> - </device> -</deviceinfo> diff --git a/fdi/Makefile.am b/fdi/Makefile.am deleted file mode 100644 index e4f2815..0000000 --- a/fdi/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2005 Adam Jackson. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -EXTRA_DIST = 11-x11-synaptics.fdi commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <jcris...@debian.org> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <k...@debian.org> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit b063ef38cdc976fdc09eda4b79084b60a97c1a06 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Thu Apr 1 14:40:47 2010 +0300 10-synaptics.conf: Use 'MatchDevicePath "/dev/input/event*"'. diff --git a/debian/changelog b/debian/changelog index ba9f6f3..337a1ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-synaptics (1.2.2-2) UNRELEASED; urgency=low + + * 10-synaptics.conf: Use 'MatchDevicePath "/dev/input/event*"'. + + -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 01 Apr 2010 14:40:18 +0300 + xserver-xorg-input-synaptics (1.2.2-1) unstable; urgency=low [ Timo Aaltonen ] diff --git a/debian/local/10-synaptics.conf b/debian/local/10-synaptics.conf index 22949b3..fb22e7d 100644 --- a/debian/local/10-synaptics.conf +++ b/debian/local/10-synaptics.conf @@ -1,5 +1,6 @@ Section "InputClass" Identifier "touchpad catchall" MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" Driver "synaptics" EndSection -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1oj3jf-00030z...@alioth.debian.org