xserver-xorg-input-synaptics: Changes to 'debian-experimental'
NEWS | 458 -------
configure.ac | 61
debian/66-xorg-synaptics.rules | 16
debian/NEWS | 31
debian/README.source | 73 +
debian/changelog | 92 +
debian/compat | 2
debian/control | 17
debian/copyright | 2
debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch | 10
debian/patches/02-do-not-use-synaptics-for-keyboards.patch | 66 +
debian/patches/series | 1
debian/rules | 12
debian/xserver-xorg-input-synaptics.README.Debian | 30
debian/xserver-xorg-input-synaptics.docs | 1
debian/xserver-xorg-input-synaptics.install | 1
debian/xserver-xorg-input-synaptics.links | 1
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 311 -----
docs/tapndrag.dia | 164 +-
fdi/11-x11-synaptics.fdi | 22
include/synaptics-properties.h | 24
include/synaptics.h | 70 -
man/synaptics.man | 434 +++++--
man/synclient.man | 19
man/syndaemon.man | 18
src/alpscomm.c | 20
src/eventcomm.c | 147 +-
src/eventcomm.h | 1
src/properties.c | 157 ++
src/ps2comm.c | 125 +-
src/ps2comm.h | 44
src/psmcomm.c | 38
src/synaptics.c | 570 ++++++---
src/synapticsstr.h | 89 +
src/synproto.h | 8
tools/Makefile.am | 9
tools/synclient.c | 616 +++++++---
tools/syndaemon.c | 388 +++++-
40 files changed, 2554 insertions(+), 1647 deletions(-)
New commits:
commit b06702185f768955598f904816af546f6648d6f7
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 2 17:00:31 2009 +0100
Build against xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 370e5ed..4f72d90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-synaptics (1.2.0-3) UNRELEASED; urgency=low
* Install an udev rule instead of an fdi file on linux.
+ * Build against xserver 1.7.
-- Julien Cristau <jcristau@debian.org> Thu, 26 Nov 2009 18:55:04 +0100
diff --git a/debian/control b/debian/control
index 58360d4..84df90d 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.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
pkg-config,
quilt,
automake,
commit 90b1b3bebc6f3a1da3cec2220a12cfd617bb28d8
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 2 16:59:57 2009 +0100
Wrap build-deps in debian/control
diff --git a/debian/control b/debian/control
index a14aa62..58360d4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,18 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mattia Dongili <malattia@debian.org>
-Build-Depends: debhelper (>= 5.0.0), libx11-dev, libxext-dev, libxi-dev (>= 2:1.2.0), x11proto-core-dev, xserver-xorg-dev (>= 2:1.5.99.901), pkg-config, quilt, automake, libtool, xutils-dev
+Build-Depends:
+ debhelper (>= 5.0.0),
+ libx11-dev,
+ libxext-dev,
+ libxi-dev (>= 2:1.2.0),
+ x11proto-core-dev,
+ xserver-xorg-dev (>= 2:1.5.99.901),
+ pkg-config,
+ quilt,
+ automake,
+ libtool,
+ xutils-dev,
Standards-Version: 3.8.3
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 f01b6ccbe59bf4c2246fb65897f48f1a3e4ce63a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Nov 26 18:57:01 2009 +0100
Install an udev rule instead of an fdi file on Linux
diff --git a/debian/66-xorg-synaptics.rules b/debian/66-xorg-synaptics.rules
new file mode 100644
index 0000000..b3b457f
--- /dev/null
+++ b/debian/66-xorg-synaptics.rules
@@ -0,0 +1,16 @@
+ACTION!="add|change", GOTO="xorg_synaptics_end"
+KERNEL!="event*", GOTO="xorg_synaptics_end"
+
+ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end"
+
+ENV{x11_driver}="synaptics"
+
+# model specific quirks
+ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \
+ ENV{x11_options.JumpyCursorThreshold}="90", \
+ ENV{x11_options.AreaBottomEdge}="4100"
+
+ATTR{[dmi/id]product_name}=="HP MiniNote 1000", \
+ ENV{x11_options.JumpyCursorThreshold}="20"
+
+LABEL="xorg_synaptics_end"
diff --git a/debian/changelog b/debian/changelog
index ccff423..370e5ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.2.0-3) UNRELEASED; urgency=low
+
+ * Install an udev rule instead of an fdi file on linux.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 26 Nov 2009 18:55:04 +0100
+
xserver-xorg-input-synaptics (1.2.0-2) unstable; urgency=low
[ Mattia Dongili ]
diff --git a/debian/rules b/debian/rules
index 7632c72..5c8cc5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -76,9 +77,6 @@ install: build
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- install -d $(CURDIR)/debian/tmp/usr/share/hal/fdi/policy/20thirdparty
- install -m 0644 fdi/11-x11-synaptics.fdi \
- $(CURDIR)/debian/tmp/usr/share/hal/fdi/policy/20thirdparty
# Build architecture-dependent files here.
binary-arch: build install serverabi
@@ -88,6 +86,14 @@ 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/66-xorg-synaptics.rules debian/xserver-xorg-input-synaptics/lib/udev/rules.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
diff --git a/debian/xserver-xorg-input-synaptics.install b/debian/xserver-xorg-input-synaptics.install
index 762fd15..f897163 100644
--- a/debian/xserver-xorg-input-synaptics.install
+++ b/debian/xserver-xorg-input-synaptics.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/input/*.so
usr/bin/*
-usr/share/hal/fdi/policy/20thirdparty/*
commit e9a880cc0c6ab0f8ed8d4a850099dd93b1effd6a
Author: Mattia Dongili <malattia@linux.it>
Date: Sat Nov 21 13:16:58 2009 +0900
Negate the match on keyboard capabilities in the default fdi file
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index b083594..ccff423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-synaptics (1.2.0-2) unstable; urgency=low
+
+ [ Mattia Dongili ]
+ * Negate the match on keyboard capabilities in the default fdi file
+ (closes: #557252).
+
+ -- Mattia Dongili <malattia@debian.org> Sat, 21 Nov 2009 13:00:37 +0900
+
xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
[ Mattia Dongili ]
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 c6d168d..890a444 100644
--- a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
+++ b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
@@ -3,8 +3,8 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524130
Index: xserver-xorg-input-synaptics/fdi/11-x11-synaptics.fdi
===================================================================
---- xserver-xorg-input-synaptics.orig/fdi/11-x11-synaptics.fdi 2009-11-19 21:59:45.252235528 +0900
-+++ xserver-xorg-input-synaptics/fdi/11-x11-synaptics.fdi 2009-11-19 22:01:46.507746665 +0900
+--- 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
@@ -2,30 +2,34 @@
<deviceinfo version="0.2">
<device>
@@ -35,7 +35,7 @@ Index: xserver-xorg-input-synaptics/fdi/11-x11-synaptics.fdi
- -->
+ <!-- do not use the synaptics driver for devices advertising
+ themselves as keyboards -->
-+ <match key="info.capabilities" contains="input.keyboard">
++ <match key="info.capabilities" contains_not="input.keyboard">
+ <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. -->
commit 349577a1cd087a0dfefd93580f549f8ccff1c8a3
Author: Mattia Dongili <malattia@linux.it>
Date: Fri Nov 20 01:26:17 2009 +0900
Make lintian happier
add a description for 02*patch, upgrade Standard-Version and debhelper
dependency.
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index a06097e..b083594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
* The driver now handles duplicate configuration in both an fdi file and
xorg.conf, see http://bugs.freedesktop.org/show_bug.cgi?id=24814
(closes: #532995).
+ * Make lintian happier: update Standard-Version and debhelper dependency.
-- Mattia Dongili <malattia@debian.org> Thu, 19 Nov 2009 21:24:49 +0900
diff --git a/debian/control b/debian/control
index f3e0ec5..a14aa62 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mattia Dongili <malattia@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev (>= 2:1.2.0), x11proto-core-dev, xserver-xorg-dev (>= 2:1.5.99.901), pkg-config, quilt, automake, libtool, xutils-dev
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 5.0.0), libx11-dev, libxext-dev, libxi-dev (>= 2:1.2.0), x11proto-core-dev, xserver-xorg-dev (>= 2:1.5.99.901), pkg-config, quilt, automake, libtool, xutils-dev
+Standards-Version: 3.8.3
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
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 722af8f..c6d168d 100644
--- a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
+++ b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
@@ -1,3 +1,6 @@
+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
===================================================================
--- xserver-xorg-input-synaptics.orig/fdi/11-x11-synaptics.fdi 2009-11-19 21:59:45.252235528 +0900
commit 321a4f45df09bfed0fcebed37140114e7d0d5168
Author: Mattia Dongili <malattia@linux.it>
Date: Fri Nov 20 01:17:38 2009 +0900
Closing duplicate configuration bugs
The driver now handles configuration in an fdi file and xorg.conf
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index fc7bc6e..a06097e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
capabilities (closes: 524130).
* Refresh patch 01-synaptics-dont-grab-if-not-on-current-VT.patch.
* Add versioned Build-Depends on libxi-dev (closes: #538299).
+ * The driver now handles duplicate configuration in both an fdi file and
+ xorg.conf, see http://bugs.freedesktop.org/show_bug.cgi?id=24814
+ (closes: #532995).
-- Mattia Dongili <malattia@debian.org> Thu, 19 Nov 2009 21:24:49 +0900
commit 2bdd8eaaa5b08e479cea3e9a33cb5ba4252a73eb
Author: Mattia Dongili <malattia@linux.it>
Date: Fri Nov 20 00:33:54 2009 +0900
Close one more SHMConfig bug
Also mention removal of the feature in the NEWS file.
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/NEWS b/debian/NEWS
index d8150a7..3aecc1d 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,14 @@
+xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
+
+ * All the shared memory code has been removed from synclient and syndaemon.
+ The SHMConfig option is still available but the only use is for monitoring
+ the hardware state data.
+ If you have any script that changes the synaptics driver configuration
+ make sure that you don't use the -s option to synclient. Or even better,
+ configure the driver via hal.
+
+ -- Mattia Dongili <malattia@debian.org> Fri, 20 Nov 2009 00:32:58 +0900
+
xserver-xorg-input-synaptics (1.1.1~git20090510-1) unstable; urgency=low
* Tapping has been disabled by default on many touchpads by upstream, see
diff --git a/debian/changelog b/debian/changelog
index bf5e768..fc7bc6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
* Finally package the new upstream release.
* Remove 02-mention-tapping-in-manpage-notes.patch now included upstream.
* All the SHM code has been removed from synclient and syndaemon
- (closes: 523652 and closes: 534333).
+ (closes: 523652 and closes: 534333 and also closes: #548357). Also add a
+ note in the NEWS file.
* Do not use the synaptics driver for devices advertising keyboard
capabilities (closes: 524130).
* Refresh patch 01-synaptics-dont-grab-if-not-on-current-VT.patch.
commit f0d1154ae58cf5f835372064eab59108811f4c29
Author: Mattia Dongili <malattia@linux.it>
Date: Thu Nov 19 23:59:26 2009 +0900
Add versioned Build-Depends on libxi-dev >= 2:1.2.0
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 674abee..bf5e768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
* Do not use the synaptics driver for devices advertising keyboard
capabilities (closes: 524130).
* Refresh patch 01-synaptics-dont-grab-if-not-on-current-VT.patch.
+ * Add versioned Build-Depends on libxi-dev (closes: #538299).
-- Mattia Dongili <malattia@debian.org> Thu, 19 Nov 2009 21:24:49 +0900
diff --git a/debian/control b/debian/control
index e9b8ede..f3e0ec5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mattia Dongili <malattia@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, x11proto-core-dev, xserver-xorg-dev (>= 2:1.5.99.901), pkg-config, quilt, automake, libtool, xutils-dev
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev (>= 2:1.2.0), x11proto-core-dev, xserver-xorg-dev (>= 2:1.5.99.901), pkg-config, quilt, automake, libtool, xutils-dev
Standards-Version: 3.8.1
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 f21af7fde2e279e22724fbfba24208f6dbd63044
Author: Mattia Dongili <malattia@linux.it>
Date: Thu Nov 19 22:02:57 2009 +0900
Refresh 01-synaptics-dont-grab-if-not-on-current-VT.patch
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 5d54e93..674abee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
(closes: 523652 and closes: 534333).
* Do not use the synaptics driver for devices advertising keyboard
capabilities (closes: 524130).
+ * Refresh patch 01-synaptics-dont-grab-if-not-on-current-VT.patch.
-- Mattia Dongili <malattia@debian.org> Thu, 19 Nov 2009 21:24:49 +0900
diff --git a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
index d5c6156..750cc25 100644
--- a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
+++ b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
@@ -4,9 +4,9 @@ instance of Xorg.
Index: xserver-xorg-input-synaptics/src/synaptics.c
===================================================================
---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-06-03 21:46:59.820825153 +0900
-+++ xserver-xorg-input-synaptics/src/synaptics.c 2009-06-06 13:35:52.016859832 +0900
-@@ -714,6 +714,9 @@
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-11-19 21:14:09.183725703 +0900
++++ xserver-xorg-input-synaptics/src/synaptics.c 2009-11-19 22:00:51.296245013 +0900
+@@ -747,6 +747,9 @@
DBG(3, ErrorF("Synaptics DeviceOn called\n"));
commit 2927810d97dc0cacf782c23ad6567ddb18dbf48c
Author: Mattia Dongili <malattia@linux.it>
Date: Thu Nov 19 22:02:14 2009 +0900
Change the fdi file to skip keyboards
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index d8390da..5d54e93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
* Remove 02-mention-tapping-in-manpage-notes.patch now included upstream.
* All the SHM code has been removed from synclient and syndaemon
(closes: 523652 and closes: 534333).
+ * Do not use the synaptics driver for devices advertising keyboard
+ capabilities (closes: 524130).
-- Mattia Dongili <malattia@debian.org> Thu, 19 Nov 2009 21:24:49 +0900
diff --git a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
new file mode 100644
index 0000000..722af8f
--- /dev/null
+++ b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
@@ -0,0 +1,63 @@
+Index: xserver-xorg-input-synaptics/fdi/11-x11-synaptics.fdi
+===================================================================
+--- xserver-xorg-input-synaptics.orig/fdi/11-x11-synaptics.fdi 2009-11-19 21:59:45.252235528 +0900
++++ xserver-xorg-input-synaptics/fdi/11-x11-synaptics.fdi 2009-11-19 22:01:46.507746665 +0900
+@@ -2,30 +2,34 @@
+ <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
+- -->
++ <!-- do not use the synaptics driver for devices advertising
++ themselves as keyboards -->
++ <match key="info.capabilities" contains="input.keyboard">
++ <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>
+ </match>
+ </device>
+ </deviceinfo>
diff --git a/debian/patches/series b/debian/patches/series
index 77484fc..3bb3f92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-synaptics-dont-grab-if-not-on-current-VT.patch
+02-do-not-use-synaptics-for-keyboards.patch
commit 5c2335359c87a9ccabf734baf6aed786535d9a88
Author: Mattia Dongili <malattia@linux.it>
Date: Thu Nov 19 21:49:29 2009 +0900
Close bugs related to SHM issues
The feature has been removed upstream.
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 387dbbb..d8390da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
[ Mattia Dongili ]
* Finally package the new upstream release.
* Remove 02-mention-tapping-in-manpage-notes.patch now included upstream.
+ * All the SHM code has been removed from synclient and syndaemon
+ (closes: 523652 and closes: 534333).
-- Mattia Dongili <malattia@debian.org> Thu, 19 Nov 2009 21:24:49 +0900
commit 0caa934d6442b4843593ff03be1b62ebd1a0826c
Author: Mattia Dongili <malattia@linux.it>
Date: Thu Nov 19 21:26:23 2009 +0900
Remove the manpage patch included upstream
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index a17246c..387dbbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
[ Mattia Dongili ]
* Finally package the new upstream release.
+ * Remove 02-mention-tapping-in-manpage-notes.patch now included upstream.
-- Mattia Dongili <malattia@debian.org> Thu, 19 Nov 2009 21:24:49 +0900
diff --git a/debian/patches/02-mention-tapping-in-manpage-notes.patch b/debian/patches/02-mention-tapping-in-manpage-notes.patch
deleted file mode 100644
index 199780b..0000000
--- a/debian/patches/02-mention-tapping-in-manpage-notes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 1f499dd3f067848c344c13e04305e9f428438c9f
-Author: Mattia Dongili <malattia@linux.it>
-Date: Fri Jun 5 08:57:06 2009 +1000
-
- man: explain TapButton default values
-
- Clarify how the new default values are set and what options to set
- to get a different behaviour.
-
- Signed-off-by: Mattia Dongili <malattia@linux.it>
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-Index: xserver-xorg-input-synaptics/man/synaptics.man
-===================================================================
---- xserver-xorg-input-synaptics.orig/man/synaptics.man 2009-06-06 12:59:09.725856323 +0900
-+++ xserver-xorg-input-synaptics/man/synaptics.man 2009-06-06 13:35:52.040859452 +0900
-@@ -813,6 +813,9 @@
- vertical scrolling is enabled, horizontal two-finger scrolling is disabled and
- edge scrolling is disabled. If no multi-finger capabilities are reported,
- edge scrolling is enabled for both horizontal and vertical scrolling.
-+Tapping is disabled by default for touchpads with one or more physical buttons.
-+To enable it you need to map tap actions to buttons. See the "TapButton1",
-+"TapButton2" and "TapButton3" options.
- .LP
- Button mapping for physical buttons is handled in the server.
- If the device is switched to left-handed (an in-server mapping of physical
diff --git a/debian/patches/series b/debian/patches/series
index 997fd71..77484fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01-synaptics-dont-grab-if-not-on-current-VT.patch
-02-mention-tapping-in-manpage-notes.patch
commit f5a183b790d56a49125cb8f5060f7b0b950de944
Author: Mattia Dongili <malattia@linux.it>
Date: Thu Nov 19 21:25:18 2009 +0900
Package the 1.2.0 upstream release
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 07d970d..a17246c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
+
+ [ Mattia Dongili ]
+ * Finally package the new upstream release.
+
+ -- Mattia Dongili <malattia@debian.org> Thu, 19 Nov 2009 21:24:49 +0900
+
xserver-xorg-input-synaptics (1.1.2-1) unstable; urgency=low
[ Mattia Dongili ]
commit d109ebbd5ee8f895e29c5fc780dce3cdb7c2f7d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 8 13:41:59 2009 +1000
synaptics 1.2.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 44800ea..bdc7764 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-synaptics],
- 1.1.99.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-synaptics)
commit 807a0ecd61ba5fcde57f5e218c790edd58784a56
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 08:06:37 2009 +1000
Require recordproto 1.13 or libXtst 1.1 for record support.
The record.h header used to be in recordproto up to excluding 1.14, then
moved to libXtst. Check for both and enable it dependent on which version we
have.
This avoids build errors on setups where a user updated recordproto but not
libXtst.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Xavier Chantry <shiningxc@gmail.com>
diff --git a/configure.ac b/configure.ac
index e9e0560..44800ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,14 @@ AC_ARG_ENABLE(tools,
[build_tools="auto"])
if test "x$build_tools" != "xno"; then
- PKG_CHECK_MODULES(XRECORD, xtst, AC_DEFINE([HAVE_XRECORD],[],[Use XRecord]), true)
+ # Record.h is either in recordproto up to 1.13.2 or in libXtst 1.1.
+ PKG_CHECK_MODULES(XTST_1_1, [xtst >= 1.0.99.1], HAVE_LIBXTST="yes", HAVE_LIBXTST="no")
+ PKG_CHECK_MODULES(RECORDPROTO_1_13, xtst [recordproto < 1.13.99.1], HAVE_RECORDPROTO="yes", HAVE_RECORDPROTO="no")
+
+ if test "x$HAVE_LIBXTST" = "xyes" || test "x$HAVE_RECORDPROTO" = "xyes" ; then
+ AC_DEFINE([HAVE_XRECORD],[],[Use XRecord])
+ fi
+
PKG_CHECK_MODULES(XI, x11 [xi >= 1.2] [xorg-server >= 1.6],
BUILD_TOOLS="yes"; AC_DEFINE(BUILD_TOOLS, 1, "Build synclient and syndaemon"),
BUILD_TOOLS="no";
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 35c04a1..65820ff 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,7 +29,7 @@ synclient_SOURCES = synclient.c
synclient_LDFLAGS = -lm $(XI_LIBS)
syndaemon_SOURCES = syndaemon.c
-syndaemon_LDFLAGS = $(XRECORD_LIBS) $(XI_LIBS)
+syndaemon_LDFLAGS = $(XTST_1_1_LIBS) $(RECORDPROTO_1_13_LIBS) $(XI_LIBS)
else
all:
@echo "Not building syndaemon and synclient."
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
commit 4422003fafe811a2d2e2fca818dc58f706e67918
Author: Alberto Milone <alberto.milone@canonical.com>
Date: Tue Sep 22 12:46:45 2009 +0200
Correct the type of the Synaptics Area options in the man page
The type of the Synaptics Area options in the man page was incorrectly
set to "boolean" but it's really "integer".
Signed-off-by: Alberto Milone <alberto.milone@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/synaptics.man b/man/synaptics.man
index 6febe7f..7c98b6b 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -482,28 +482,28 @@ SHMConfig option and run "synclient \-m 1" to see the x/y coordinates
corresponding to different positions on the touchpad.
.
.TP
-.BI "Option \*qAreaLeftEdge\*q \*q" boolean \*q
+.BI "Option \*qAreaLeftEdge\*q \*q" integer \*q
Ignore movements, scrolling and tapping which take place left of this edge.
.
The option is disabled by default and can be enabled by setting the
AreaLeftEdge option to any integer value other than zero. Property: "Synaptics Area"
.
.TP
-.BI "Option \*qAreaRightEdge\*q \*q" boolean \*q
+.BI "Option \*qAreaRightEdge\*q \*q" integer \*q
Ignore movements, scrolling and tapping which take place right of this edge.
.
The option is disabled by default and can be enabled by setting the
AreaRightEdge option to any integer value other than zero. Property: "Synaptics Area"
.
.TP
-.BI "Option \*qAreaTopEdge\*q \*q" boolean \*q
+.BI "Option \*qAreaTopEdge\*q \*q" integer \*q
Ignore movements, scrolling and tapping which take place above this edge.
.
The option is disabled by default and can be enabled by setting the
AreaTopEdge option to any integer value other than zero. Property: "Synaptics Area"
.
.TP
-.BI "Option \*qAreaBottomEdge\*q \*q" boolean \*q
+.BI "Option \*qAreaBottomEdge\*q \*q" integer \*q
Ignore movements, scrolling and tapping which take place below this edge.
.
The option is disabled by default and can be enabled by setting the
commit 2b27e79d0c6cab73ecb8d00e1dbad32a8150033c
Author: Christoph Brill <egore911@egore911.de>
Date: Sat Sep 12 09:52:50 2009 +0200
Revert "Add support for reducing the build process output by using shave"
This reverts commit 583678b8fe540d9a4120e6c93115b4a141888a2e. Peter
Hutterer informed me that util-macros 1.3.0 already provide the same
functionality when using automake 1.11.
Conflicts:
configure.ac
diff --git a/.gitignore b/.gitignore
index ea062c2..1aaf548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,3 @@ synclient
syndaemon
*.[0-9]
*.pc
-shave
-shave-libtool
-*~
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 40e47f4..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,102 +0,0 @@
-dnl Make automake/libtool output more friendly to humans
-dnl
-dnl Copyright (c) 2009, Damien Lespiau <damien.lespiau@gmail.com>
-dnl
-dnl Permission is hereby granted, free of charge, to any person
-dnl obtaining a copy of this software and associated documentation
-dnl files (the "Software"), to deal in the Software without
-dnl restriction, including without limitation the rights to use,
-dnl copy, modify, merge, publish, distribute, sublicense, and/or sell
-dnl copies of the Software, and to permit persons to whom the
-dnl Software is furnished to do so, subject to the following
-dnl conditions:
-dnl
-dnl The above copyright notice and this permission notice shall be
-dnl included in all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-dnl EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-dnl OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-dnl NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-dnl HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-dnl WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl SHAVE_INIT([shavedir],[default_mode])
-dnl
-dnl shavedir: the directory where the shave scripts are, it defaults to
-dnl $(top_builddir)
-dnl default_mode: (enable|disable) default shave mode. This parameter
-dnl controls shave's behaviour when no option has been
-dnl given to configure. It defaults to disable.
-dnl
-dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
-dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and
-dnl LIBTOOL, you don't want the configure tests to have these variables
-dnl re-defined.
-dnl * This macro requires GNU make's -s option.
-
-AC_DEFUN([_SHAVE_ARG_ENABLE],
-[
- AC_ARG_ENABLE([shave],
- AS_HELP_STRING(
- [--enable-shave],
- [use shave to make the build pretty [[default=$1]]]),,
- [enable_shave=$1]
- )
-])
-
-AC_DEFUN([SHAVE_INIT],
-[
- dnl you can tweak the default value of enable_shave
- m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
-
- if test x"$enable_shave" = xyes; then
- dnl where can we find the shave scripts?
- m4_if([$1],,
- [shavedir="$ac_pwd"],
- [shavedir="$ac_pwd/$1"])
- AC_SUBST(shavedir)
-
- dnl make is now quiet
- AC_SUBST([MAKEFLAGS], [-s])
- AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
-
- dnl we need sed
- AC_CHECK_PROG(SED,sed,sed,false)
-
- dnl substitute libtool
- SHAVE_SAVED_LIBTOOL=$LIBTOOL
- LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
- AC_SUBST(LIBTOOL)
-
- dnl substitute cc/cxx
- SHAVE_SAVED_CC=$CC
- SHAVE_SAVED_CXX=$CXX
- SHAVE_SAVED_FC=$FC
- SHAVE_SAVED_F77=$F77
- SHAVE_SAVED_OBJC=$OBJC
- SHAVE_SAVED_MCS=$MCS
- CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
- CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
- FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
- F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
- OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
- MCS="${SHELL} ${shavedir}/shave mcs ${SHAVE_SAVED_MCS}"
- AC_SUBST(CC)
- AC_SUBST(CXX)
- AC_SUBST(FC)
- AC_SUBST(F77)
- AC_SUBST(OBJC)
- AC_SUBST(MCS)
-
- V=@
- else
- V=1
- fi
- Q='$(V:1=)'
- AC_SUBST(V)
- AC_SUBST(Q)
-])
-
diff --git a/configure.ac b/configure.ac
index 607647b..e9e0560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,6 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-AC_CONFIG_FILES([shave shave-libtool])
-
DRIVER_NAME=synaptics
AC_SUBST([DRIVER_NAME])
@@ -125,7 +123,8 @@ AC_SUBST(BUILD_TOOLS)
# Checks for header files.
Reply to: