xserver-xorg-input-synaptics: Changes to 'debian-unstable'
debian/changelog | 10
debian/control | 10
debian/copyright | 2
debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch | 14 +
debian/patches/02-scandir-dev-input.patch | 113 ++++++++++
debian/patches/03-escape-dashes-in-manpages.patch | 13 +
debian/patches/series | 3
debian/rules | 9
debian/xsfbs/xsfbs.mk | 23 --
9 files changed, 163 insertions(+), 34 deletions(-)
New commits:
commit 38b52a0bbd0b359a4e09a3ab95772bda07dff1fa
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Jan 1 22:26:53 2008 +0900
Remove extraneous hunks...
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/patches/02-scandir-dev-input.patch b/debian/patches/02-scandir-dev-input.patch
index 74e19b2..d3e27f9 100644
--- a/debian/patches/02-scandir-dev-input.patch
+++ b/debian/patches/02-scandir-dev-input.patch
@@ -1,26 +1,3 @@
-diff --git a/debian/control b/debian/control
-index dd8ebe1..cbf581c 100644
---- a/debian/control
-+++ b/debian/control
-@@ -4,9 +4,10 @@ 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.4), pkg-config, quilt
--Standards-Version: 3.7.2
--XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
--XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
-+Standards-Version: 3.7.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
-+Homepage: http://web.telia.com/~u89404340/touchpad/index.html
-
- Package: xfree86-driver-synaptics
- Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc
-@@ -48,4 +49,3 @@ Description: Synaptics TouchPad driver for X.Org/XFree86 server
- * It also provides a daemon to disable touchpad while typing at the keyboard
- and thus avoid unwanted mouse movements (see syndaemon(1)).
- .
-- Homepage: http://web.telia.com/~u89404340/touchpad/index.html
diff --git a/eventcomm.c b/eventcomm.c
index e3257cd..565c438 100644
--- a/eventcomm.c
@@ -134,17 +111,3 @@ index e3257cd..565c438 100644
}
struct SynapticsProtocolOperations event_proto_operations = {
-diff --git a/synaptics.c b/synaptics.c
-index 802132c..5f7ba6d 100644
---- a/synaptics.c
-+++ b/synaptics.c
-@@ -588,6 +588,9 @@ DeviceOn(DeviceIntPtr dev)
-
- DBG(3, ErrorF("Synaptics DeviceOn called\n"));
-
-+ if (xf86Screens[0]->vtSema == FALSE)
-+ return !Success;
-+
- SetDeviceAndProtocol(local);
- local->fd = xf86OpenSerial(local->options);
- if (local->fd == -1) {
commit bbab0dc4e382b3797a0169a92366427b6c08f3fa
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Jan 1 20:34:18 2008 +0900
Escape dashes in manpages (see if using a quilt patch for that is maintainable)
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/patches/03-escape-dashes-in-manpages.patch b/debian/patches/03-escape-dashes-in-manpages.patch
new file mode 100644
index 0000000..fb6431e
--- /dev/null
+++ b/debian/patches/03-escape-dashes-in-manpages.patch
@@ -0,0 +1,13 @@
+diff --git a/manpages/synaptics.5 b/manpages/synaptics.5
+index 6e99bd0..195a670 100644
+--- a/manpages/synaptics.5
++++ b/manpages/synaptics.5
+@@ -393,7 +393,7 @@ Coordinates to the left of LeftEdge are part of the left edge (areas
+ (area 1) are part of the upper left corner, etc.
+ .
+ A good way to find appropriate edge parameters is to enable the
+-SHMConfig option and run "synclient -m 1" to see the x/y coordinates
++SHMConfig option and run "synclient \-m 1" to see the x/y coordinates
+ corresponding to different positions on the touchpad.
+ .
+ .LP
diff --git a/debian/patches/series b/debian/patches/series
index 18387b6..43a2697 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-synaptics-dont-grab-if-not-on-current-VT.patch
02-scandir-dev-input.patch
+03-escape-dashes-in-manpages.patch
commit 64db5579b5ab042ecb6569fb14dcb7edaa1bd55d
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Jan 1 20:30:01 2008 +0900
Convert copyright file to UTF-8
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/copyright b/debian/copyright
index 0b1ee75..5d9a193 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Tue, 2 Mar 2004 11:42:05 +0100.
It was downloaded from http://w1.894.telia.com/~u89404340/touchpad/index.html
-Upstream Author: Peter �terlund <petero2@telia.com>
+Upstream Author: Peter Österlund <petero2@telia.com>
Copyright:
commit 6f92e04c1571866cfc943c8e2797a6674a5b625c
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Jan 1 19:20:15 2008 +0900
Add patch to scan all the available /dev/input/event* device nodes
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 7b3d8fa..4260c4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xfree86-driver-synaptics (0.14.7~git20070706-2) unstable; urgency=low
* 01-synaptics-dont-grab-if-not-on-current-VT.patch from Matthew Garrett in
Ubuntu's 0.14.6-0ubuntu10 (Closes: #437273)
+ * 02-scandir-dev-input.patch to scan all the event devices in /dev/input
+ (Closes: #455994)
* update xsfbs
-- Mattia Dongili <malattia@debian.org> Tue, 01 Jan 2008 12:38:13 +0900
diff --git a/debian/patches/02-scandir-dev-input.patch b/debian/patches/02-scandir-dev-input.patch
new file mode 100644
index 0000000..74e19b2
--- /dev/null
+++ b/debian/patches/02-scandir-dev-input.patch
@@ -0,0 +1,150 @@
+diff --git a/debian/control b/debian/control
+index dd8ebe1..cbf581c 100644
+--- a/debian/control
++++ b/debian/control
+@@ -4,9 +4,10 @@ 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.4), pkg-config, quilt
+-Standards-Version: 3.7.2
+-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
+-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
++Standards-Version: 3.7.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
++Homepage: http://web.telia.com/~u89404340/touchpad/index.html
+
+ Package: xfree86-driver-synaptics
+ Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc
+@@ -48,4 +49,3 @@ Description: Synaptics TouchPad driver for X.Org/XFree86 server
+ * It also provides a daemon to disable touchpad while typing at the keyboard
+ and thus avoid unwanted mouse movements (see syndaemon(1)).
+ .
+- Homepage: http://web.telia.com/~u89404340/touchpad/index.html
+diff --git a/eventcomm.c b/eventcomm.c
+index e3257cd..565c438 100644
+--- a/eventcomm.c
++++ b/eventcomm.c
+@@ -22,6 +22,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <dirent.h>
++#include <string.h>
+ #include <stdio.h>
+ #include "synproto.h"
+ #define SYNAPTICS_PRIVATE
+@@ -259,54 +261,60 @@ EventReadHwState(LocalDevicePtr local, struct SynapticsHwInfo *synhw,
+ return FALSE;
+ }
+
++/* filter for the AutoDevProbe scandir on /dev/input */
++static int EventDevOnly(const struct dirent *dir) {
++ return strncmp(EVENT_DEV_NAME, dir->d_name, 5) == 0;
++}
++
+ static Bool
+ EventAutoDevProbe(LocalDevicePtr local)
+ {
+ /* We are trying to find the right eventX device or fall back to
+ the psaux protocol and the given device from XF86Config */
+ int i;
+- Bool have_evdev = FALSE;
+- int noent_cnt = 0;
+- const int max_skip = 10;
++ Bool touchpad_found = FALSE;
++ struct dirent **namelist;
+
+- for (i = 0; ; i++) {
+- char fname[64];
+- int fd = -1;
+- Bool is_touchpad;
++ i = scandir(DEV_INPUT_EVENT, &namelist, EventDevOnly, alphasort);
++ if (i < 0) {
++ ErrorF("Couldn't open %s\n", DEV_INPUT_EVENT);
++ return FALSE;
++ }
++ else if (i == 0) {
++ ErrorF("%s The /dev/input/event* device nodes seem to be missing\n",
++ local->name);
++ free(namelist);
++ return FALSE;
++ }
+
+- sprintf(fname, "%s/%s%d", DEV_INPUT_EVENT, EVENT_DEV_NAME, i);
+- SYSCALL(fd = open(fname, O_RDONLY));
+- if (fd < 0) {
+- if (errno == ENOENT) {
+- if (++noent_cnt >= max_skip)
+- break;
+- else
+- continue;
+- } else {
+- continue;
+- }
+- }
+- noent_cnt = 0;
+- have_evdev = TRUE;
+- is_touchpad = event_query_is_touchpad(fd);
+- if (is_touchpad) {
+- xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n",
+- local->name, fname);
+- xf86ReplaceStrOption(local->options, "Device", fname);
+- event_query_abs_params(local, fd);
+- SYSCALL(close(fd));
+- return TRUE;
+- }
+- SYSCALL(close(fd));
++ while (i--) {
++ char fname[64];
++ int fd = -1;
++
++ if (!touchpad_found) {
++ sprintf(fname, "%s/%s", DEV_INPUT_EVENT, namelist[i]->d_name);
++ SYSCALL(fd = open(fname, O_RDONLY));
++ if (fd < 0)
++ continue;
++
++ if (event_query_is_touchpad(fd)) {
++ touchpad_found = TRUE;
++ xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n",
++ local->name, fname);
++ xf86ReplaceStrOption(local->options, "Device", fname);
++ event_query_abs_params(local, fd);
++ }
++ SYSCALL(close(fd));
++ }
++ free(namelist[i]);
+ }
+- ErrorF("%s no synaptics event device found (checked %d nodes)\n",
+- local->name, i + 1);
+- if (i <= max_skip)
+- ErrorF("%s The /dev/input/event* device nodes seem to be missing\n",
+- local->name);
+- if (i > max_skip && !have_evdev)
+- ErrorF("%s The evdev kernel module seems to be missing\n", local->name);
+- return FALSE;
++ free(namelist);
++
++ if (!touchpad_found) {
++ ErrorF("%s no synaptics event device found\n", local->name);
++ return FALSE;
++ }
++ return TRUE;
+ }
+
+ struct SynapticsProtocolOperations event_proto_operations = {
+diff --git a/synaptics.c b/synaptics.c
+index 802132c..5f7ba6d 100644
+--- a/synaptics.c
++++ b/synaptics.c
+@@ -588,6 +588,9 @@ DeviceOn(DeviceIntPtr dev)
+
+ DBG(3, ErrorF("Synaptics DeviceOn called\n"));
+
++ if (xf86Screens[0]->vtSema == FALSE)
++ return !Success;
++
+ SetDeviceAndProtocol(local);
+ local->fd = xf86OpenSerial(local->options);
+ if (local->fd == -1) {
diff --git a/debian/patches/series b/debian/patches/series
index 77484fc..18387b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-synaptics-dont-grab-if-not-on-current-VT.patch
+02-scandir-dev-input.patch
commit 5219462b6b9d9bb76625010ede0a8e6ad97c7dfa
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Jan 1 19:19:13 2008 +0900
Use real headers for Vcs and Homepage (lintian checks)
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/control b/debian/control
index dd8ebe1..cbf581c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,10 @@ 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.4), pkg-config, quilt
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
+Standards-Version: 3.7.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
+Homepage: http://web.telia.com/~u89404340/touchpad/index.html
Package: xfree86-driver-synaptics
Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc
@@ -48,4 +49,3 @@ Description: Synaptics TouchPad driver for X.Org/XFree86 server
* It also provides a daemon to disable touchpad while typing at the keyboard
and thus avoid unwanted mouse movements (see syndaemon(1)).
.
- Homepage: http://web.telia.com/~u89404340/touchpad/index.html
commit 55cb6e91fdddc5cdf3ebed03f4405ac579fb0b7f
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Jan 1 12:41:16 2008 +0900
Add patch to only grab the synaptics device from the xserver that is running on the current display
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index a780b5f..7b3d8fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xfree86-driver-synaptics (0.14.7~git20070706-2) unstable; urgency=low
+
+ * 01-synaptics-dont-grab-if-not-on-current-VT.patch from Matthew Garrett in
+ Ubuntu's 0.14.6-0ubuntu10 (Closes: #437273)
+ * update xsfbs
+
+ -- Mattia Dongili <malattia@debian.org> Tue, 01 Jan 2008 12:38:13 +0900
+
xfree86-driver-synaptics (0.14.7~git20070706-1) unstable; urgency=low
* build with xserver-xorg-core 1.4 (Closes: #442314)
diff --git a/debian/control b/debian/control
index 161eb6a..dd8ebe1 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.4), pkg-config
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, x11proto-core-dev, xserver-xorg-dev (>= 2:1.4), pkg-config, quilt
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
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
new file mode 100644
index 0000000..8090e6e
--- /dev/null
+++ b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
@@ -0,0 +1,14 @@
+diff --git a/synaptics.c b/synaptics.c
+index 802132c..5f7ba6d 100644
+--- a/synaptics.c
++++ b/synaptics.c
+@@ -588,6 +588,9 @@ DeviceOn(DeviceIntPtr dev)
+
+ DBG(3, ErrorF("Synaptics DeviceOn called\n"));
+
++ if (xf86Screens[0]->vtSema == FALSE)
++ return !Success;
++
+ SetDeviceAndProtocol(local);
+ local->fd = xf86OpenSerial(local->options);
+ if (local->fd == -1) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..77484fc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-synaptics-dont-grab-if-not-on-current-VT.patch
diff --git a/debian/rules b/debian/rules
index 6c215e5..8e79feb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ include debian/xsfbs/xsfbs.mk
PACKAGE=xserver-xorg-input-synaptics
-configure: configure-stamp
+configure: configure-stamp patch
configure-stamp:
dh_testdir
# the package: nothing to do
@@ -16,9 +16,8 @@ configure-stamp:
touch configure-stamp
-build: build-stamp
-
-build-stamp: configure-stamp
+build: configure build-stamp
+build-stamp:
dh_testdir
# compile the package: detect architecture and launch make
commit 98598942d576471952ee757988c8d66ce190ee8e
Author: Mattia Dongili <malattia@linux.it>
Date: Mon Dec 31 10:44:14 2007 +0900
Uningnore errors from make clean as the Makefile is always there
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/rules b/debian/rules
index 728920c..6c215e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ clean: xsfclean
rm -f build-stamp configure-stamp
# clean up:
- -$(MAKE) clean
+ $(MAKE) clean
dh_clean
commit 331c032528ba1faebef1d8eaa56db47f533f0426
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Sep 22 23:49:11 2007 -0400
Remove make-orig-tar-gz target
This target wasn't kept up to date and was totally broken for the git
world. The way we use git has made this target pretty well impossible to
use in any form, so it's been supersceded by a script that is currently
located at
http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index bfca7bb..b8f7afd 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -272,29 +272,6 @@ prune-upstream-tree:
dh_testdir
grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
-# Change to what should be the correct directory, ensure it is, and if
-# so, create the .orig.tar.gz file. Exclude the debian directory and its
-# contents, and any .svn directories and their contents (so that we can safely
-# build an .orig.tar.gz from SVN checkout, not just an export).
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-#
-# This rule *IS* the recommended method for creating a new .orig.tar.gz file,
-# for the rare situations when one is needed.
-.PHONY: make-orig-tar-gz
-make-orig-tar-gz: clean prune-upstream-tree
- ( cd .. \
- && if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER) ]; then \
- echo "Our current working directory has the wrong name. Renaming..." >&2; \
- mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \
- fi; \
- tar --exclude=debian --exclude=debian/* \
- --exclude=.svn --exclude=.svn/* \
- -cf - $(SOURCE_NAME)-$(NO_EPOCH_VER) \
- | gzip -9 >$(SOURCE_NAME)_$(NO_EPOCH_VER).orig.tar.gz; \
- )
-
# Verify that there are no offsets or fuzz in the patches we apply.
#
# Note: This rule is for Debian package maintainers' convenience, and is not
Reply to: