xserver-xorg-input-evdev: Changes to 'ubuntu'
ChangeLog | 70 ++++++
configure.ac | 2
debian/changelog | 43 ++++
debian/control | 21 +
debian/local/65-xorg-evdev.rules | 15 -
debian/patches/100-silence-eviocgname-error.patch | 25 ++
debian/patches/series | 1
debian/xserver-xorg-input-evdev-dev.install | 3
debian/xserver-xorg-input-evdev.postinst.in | 21 +
debian/xsfbs/xsfbs.mk | 21 -
debian/xsfbs/xsfbs.sh | 233 ----------------------
src/evdev.c | 43 +++-
12 files changed, 228 insertions(+), 270 deletions(-)
New commits:
commit 63ab79051577025372027c6172cec5eef03b6b5f
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Tue Feb 23 23:38:36 2010 -0500
Add a patch to silence the EVIOCGNAME errors from the log.
diff --git a/debian/changelog b/debian/changelog
index ee4f783..cbcb8f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.3.2-3ubuntu1) lucid; urgency=low
+
+ * Add 100-silence-eviocgname-error.patch:
+ - Silences the harmless EVIOCGNAME errors from the log.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Tue, 23 Feb 2010 23:28:05 -0500
+
xserver-xorg-input-evdev (1:2.3.2-3) unstable; urgency=low
* 65-xorg-evdev.rules: instead of blacklisting joysticks, explicitly
diff --git a/debian/patches/100-silence-eviocgname-error.patch b/debian/patches/100-silence-eviocgname-error.patch
new file mode 100644
index 0000000..c9cfb57
--- /dev/null
+++ b/debian/patches/100-silence-eviocgname-error.patch
@@ -0,0 +1,25 @@
+From 3a06d505b3b1eaecc6e55aedd22106655d73f12a Mon Sep 17 00:00:00 2001
+From: Robert Hooker <sarvatt@ubuntu.com>
+Date: Tue, 23 Feb 2010 22:53:52 -0500
+Subject: [PATCH] Silence EVIOCGNAME error.
+
+---
+ src/evdev.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/evdev.c b/src/evdev.c
+index 58ffcea..f9aae2c 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -1656,7 +1656,7 @@ EvdevCacheCompare(InputInfoPtr pInfo, BOOL compare)
+ unsigned long led_bitmask[NLONGS(LED_CNT)] = {0};
+
+ if (ioctl(pInfo->fd, EVIOCGNAME(sizeof(name) - 1), name) < 0) {
+- xf86Msg(X_ERROR, "ioctl EVIOCGNAME failed: %s\n", strerror(errno));
++ /* xf86Msg(X_ERROR, "ioctl EVIOCGNAME failed: %s\n", strerror(errno)); */
+ goto error;
+ }
+
+--
+1.7.0
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..33cdf8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+100-silence-eviocgname-error.patch
commit 0d9675c50a127d4db06b87dd84307f32d7a719ef
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 12 10:40:25 2010 +0000
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 0620050..8902c90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-evdev (1:2.3.2-3) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-3) unstable; urgency=low
* 65-xorg-evdev.rules: instead of blacklisting joysticks, explicitly
whitelist keyboards, mice, touchscreens and touchpads (closes: #564219).
We'll need a better solution, but this should do for now.
* No need to test for linux in postinst, this package only exists on linux.
- -- Julien Cristau <jcristau@debian.org> Tue, 12 Jan 2010 10:13:45 +0000
+ -- Julien Cristau <jcristau@debian.org> Tue, 12 Jan 2010 10:36:54 +0000
xserver-xorg-input-evdev (1:2.3.2-2) unstable; urgency=low
commit 714a2424d591fb7d7ef016ba89112502bb67584f
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 12 10:36:39 2010 +0000
No need to test for linux in postinst, this package only exists on linux.
diff --git a/debian/changelog b/debian/changelog
index bf1faae..0620050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.3.2-3) UNRELEASED; urgency=low
* 65-xorg-evdev.rules: instead of blacklisting joysticks, explicitly
whitelist keyboards, mice, touchscreens and touchpads (closes: #564219).
We'll need a better solution, but this should do for now.
+ * No need to test for linux in postinst, this package only exists on linux.
-- Julien Cristau <jcristau@debian.org> Tue, 12 Jan 2010 10:13:45 +0000
diff --git a/debian/xserver-xorg-input-evdev.postinst.in b/debian/xserver-xorg-input-evdev.postinst.in
index 009f2c7..014c92b 100644
--- a/debian/xserver-xorg-input-evdev.postinst.in
+++ b/debian/xserver-xorg-input-evdev.postinst.in
@@ -10,9 +10,7 @@ THIS_SCRIPT=postinst
case "$1" in
configure)
if dpkg --compare-versions "$2" lt 1:2.3.2-3; then
- if [ `uname -s` = "Linux" ]; then
- udevadm trigger --subsystem-match=input --action=change
- fi
+ udevadm trigger --subsystem-match=input --action=change
fi
esac
commit 29fb39fe6898c221ed4870cfe59683ff44af8de5
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 12 10:35:14 2010 +0000
Run udevadm trigger on upgrade to this version due to rules change
diff --git a/debian/xserver-xorg-input-evdev.postinst.in b/debian/xserver-xorg-input-evdev.postinst.in
index 2d7e9a6..009f2c7 100644
--- a/debian/xserver-xorg-input-evdev.postinst.in
+++ b/debian/xserver-xorg-input-evdev.postinst.in
@@ -9,7 +9,7 @@ THIS_SCRIPT=postinst
case "$1" in
configure)
- if dpkg --compare-versions "$2" lt 1:2.3.1-2; then
+ if dpkg --compare-versions "$2" lt 1:2.3.2-3; then
if [ `uname -s` = "Linux" ]; then
udevadm trigger --subsystem-match=input --action=change
fi
commit d293b7ae066ab55540809b99ba770174dfca3bc7
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 12 10:17:04 2010 +0000
65-xorg-evdev.rules: don't set x11_driver for accelerometers
Instead of blacklisting joysticks, explicitly whitelist keyboards, mice,
touchscreens and touchpads (closes: #564219). We'll need a better
solution, but this should do for now.
diff --git a/debian/changelog b/debian/changelog
index 1456356..bf1faae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-evdev (1:2.3.2-3) UNRELEASED; urgency=low
+
+ * 65-xorg-evdev.rules: instead of blacklisting joysticks, explicitly
+ whitelist keyboards, mice, touchscreens and touchpads (closes: #564219).
+ We'll need a better solution, but this should do for now.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 12 Jan 2010 10:13:45 +0000
+
xserver-xorg-input-evdev (1:2.3.2-2) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
index 9324cba..ea4a9bb 100644
--- a/debian/local/65-xorg-evdev.rules
+++ b/debian/local/65-xorg-evdev.rules
@@ -1,10 +1,12 @@
ACTION!="add|change", GOTO="xorg_evdev_end"
-# By default, we use the -evdev driver for every input device except
-# joysticks; later rules can then change the driver for specific input
+# By default, we use the -evdev driver for every mouse, keyboard, touchscreen
+# or touchpad; later rules can then change the driver for specific input
# devices.
ENV{ID_INPUT}=="", GOTO="xorg_evdev_end"
-ENV{ID_INPUT_JOYSTICK}=="?*", GOTO="xorg_evdev_end"
-ENV{x11_driver}="evdev"
+ENV{ID_INPUT_MOUSE}=="?*", ENV{x11_driver}="evdev"
+ENV{ID_INPUT_KEY}=="?*", ENV{x11_driver}="evdev"
+ENV{ID_INPUT_TOUCHSCREEN}=="?*", ENV{x11_driver}="evdev"
+ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{x11_driver}="evdev"
LABEL="xorg_evdev_end"
commit a5fbec7502dbacf503f0cdb9a59ffbfbd5b7d018
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jan 7 20:22:12 2010 +0000
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f534878..1456356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.3.2-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-2) unstable; urgency=low
[ Timo Aaltonen ]
* evdev.rules: Skip joysticks, since using evdev for those is
@@ -6,8 +6,9 @@ xserver-xorg-input-evdev (1:2.3.2-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* evdev.rules: Match on ID_INPUT instead of device name + subsystem.
+ * Upload to unstable.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 06 Jan 2010 13:45:23 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 07 Jan 2010 20:21:57 +0000
xserver-xorg-input-evdev (1:2.3.2-1) experimental; urgency=low
commit 126afcc73d4b185464ca6e3689312b8b4a797404
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jan 7 20:21:23 2010 +0000
evdev.rules: Match on ID_INPUT instead of device name + subsystem.
diff --git a/debian/changelog b/debian/changelog
index ce6fa85..f534878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-input-evdev (1:2.3.2-2) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* evdev.rules: Skip joysticks, since using evdev for those is
generally considered as a bad idea. Use -joystick instead.
+ [ Julien Cristau ]
+ * evdev.rules: Match on ID_INPUT instead of device name + subsystem.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 06 Jan 2010 13:45:23 +0200
xserver-xorg-input-evdev (1:2.3.2-1) experimental; urgency=low
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
index 2d99ce3..9324cba 100644
--- a/debian/local/65-xorg-evdev.rules
+++ b/debian/local/65-xorg-evdev.rules
@@ -1,10 +1,9 @@
ACTION!="add|change", GOTO="xorg_evdev_end"
-SUBSYSTEM!="input", GOTO="xorg_evdev_end"
-KERNEL!="event*", GOTO="xorg_evdev_end"
# By default, we use the -evdev driver for every input device except
# joysticks; later rules can then change the driver for specific input
# devices.
+ENV{ID_INPUT}=="", GOTO="xorg_evdev_end"
ENV{ID_INPUT_JOYSTICK}=="?*", GOTO="xorg_evdev_end"
ENV{x11_driver}="evdev"
commit 1b82f1a5300d9806353b616ac6ee9e18c08fd3b0
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Jan 6 13:53:30 2010 +0200
evdev.rules: Skip joysticks, since using evdev for those is generally considered as a bad idea. Use -joystick instead.
diff --git a/debian/changelog b/debian/changelog
index 4d24f84..ce6fa85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.3.2-2) UNRELEASED; urgency=low
+
+ * evdev.rules: Skip joysticks, since using evdev for those is
+ generally considered as a bad idea. Use -joystick instead.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 06 Jan 2010 13:45:23 +0200
+
xserver-xorg-input-evdev (1:2.3.2-1) experimental; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
index 6c201f5..2d99ce3 100644
--- a/debian/local/65-xorg-evdev.rules
+++ b/debian/local/65-xorg-evdev.rules
@@ -2,8 +2,10 @@ ACTION!="add|change", GOTO="xorg_evdev_end"
SUBSYSTEM!="input", GOTO="xorg_evdev_end"
KERNEL!="event*", GOTO="xorg_evdev_end"
-# By default, we use the -evdev driver for every input device; later rules can
-# then change the driver for specific input devices.
+# By default, we use the -evdev driver for every input device except
+# joysticks; later rules can then change the driver for specific input
+# devices.
+ENV{ID_INPUT_JOYSTICK}=="?*", GOTO="xorg_evdev_end"
ENV{x11_driver}="evdev"
LABEL="xorg_evdev_end"
commit a75796f02c1b507f1a4777b76a0755af403dad49
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Dec 12 17:56:28 2009 +0100
Prepare Changelog for upload
diff --git a/debian/changelog b/debian/changelog
index d6f9b23..4d24f84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.3.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-1) experimental; urgency=low
[ Timo Aaltonen ]
* Build against Xserver 1.7.
@@ -11,7 +11,7 @@ xserver-xorg-input-evdev (1:2.3.2-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* New upstream release.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Dec 2009 13:47:20 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 12 Dec 2009 17:56:22 +0100
xserver-xorg-input-evdev (1:2.3.1-1) experimental; urgency=low
commit edca5b7c041ee5435707a54170e36a104487847b
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Dec 12 17:56:12 2009 +0100
New upstream release
diff --git a/ChangeLog b/ChangeLog
index de41ae1..e5357db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+commit f7850a40424f7ec0c32fb2b46d427b51b5410d99
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Dec 11 13:42:33 2009 +1000
+
+ evdev 2.3.2
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit bd4102af6e168c1b9129301f88e9601f8f5e0848
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Dec 1 15:44:39 2009 +1000
+
+ Fix up BTN_TOUCH handling for non-button tablets.
+
+ BTN_TOOL_* is treated as tool, just like before. BTN_TOUCH on the other hand
+ may need to be treated as a button left press. This again requires a button
+ class.
+
+ Tested on an HP Touchsmart and a Wacom tablet.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 1b0df04abe329433658c95debdafdf1714173814)
+
+commit 22e816eb326a5495a5dc6e0a94394534d6645bae
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Dec 1 14:16:10 2009 +1000
+
+ Only init the calibration property for absolute devices.
+
+ Relative devices can't be calibrated anyway so why bother.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 2ca24a16f08095f35d5610f16e202c525b3075e9)
+
+commit b6b377fe9afa51ee8cbef8e9830537806e94a3ac
+Author: David Woodhouse <dwmw2@infradead.org>
+Date: Tue Dec 1 00:14:54 2009 +0000
+
+ Report initial calibration parameters.
+
+ Where an initial calibration is provided through the Calibration option
+ to the driver, it wasn't being exposed in the 'Evdev Axis Calibration'
+ property. Remedy that...
+
+ Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 7b285a802b8ccddd1edcf40ab345c4a96bcdf43c)
+
+commit 3772676fd65065b43a94234127537ab5030b09f8
+Author: David Woodhouse <dwmw2@infradead.org>
+Date: Tue Dec 1 00:12:36 2009 +0000
+
+ Swap axes before applying touch screen calibration.
+
+ When the SwapAxes option is set, the X and Y axes in calibration should
+ be labelled as the user perceives them -- not as the kernel sends them.
+
+ Currently, we apply the X-axis calibration to the X-axis of the input,
+ and then do the axis swapping so we've actually applied the X-axis
+ calibration to what the user sees as the Y-axis.
+
+ This patch changes the order of the operations, so that the axes are
+ swapped before the calibration is applied.
+
+ Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit f187badb71554a73bf9ca30ce75c9d166e688f03)
+
commit 4f05afd495214ad48ffab7bdb1cde69aacc5af8f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 20 11:18:03 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 6d7df35..d6f9b23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.3.1-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Build against Xserver 1.7.
@@ -8,6 +8,9 @@ xserver-xorg-input-evdev (1:2.3.1-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* 65-xorg-evdev.rules: don't ignore change events.
+ [ Brice Goglin ]
+ * New upstream release.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Dec 2009 13:47:20 +0200
xserver-xorg-input-evdev (1:2.3.1-1) experimental; urgency=low
commit f7850a40424f7ec0c32fb2b46d427b51b5410d99
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 11 13:42:33 2009 +1000
evdev 2.3.2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 841558c..d2a3bc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 2.3.1,
+ 2.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit 3eddc02011d7805d8f959b6ca626df33d1f6a90b
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 8 13:36:59 2009 +0100
65-xorg-evdev.rules: don't ignore change events.
diff --git a/debian/changelog b/debian/changelog
index 562d904..6d7df35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-input-evdev (1:2.3.1-2) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Build against Xserver 1.7.
* Run udevadm trigger on postinst, and depend on udev [linux-any].
* Add xserver-xorg-input-evdev-dev for the header and .pc files.
+ [ Julien Cristau ]
+ * 65-xorg-evdev.rules: don't ignore change events.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Dec 2009 13:47:20 +0200
xserver-xorg-input-evdev (1:2.3.1-1) experimental; urgency=low
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
index 48bbc8a..6c201f5 100644
--- a/debian/local/65-xorg-evdev.rules
+++ b/debian/local/65-xorg-evdev.rules
@@ -1,4 +1,4 @@
-ACTION!="add", GOTO="xorg_evdev_end"
+ACTION!="add|change", GOTO="xorg_evdev_end"
SUBSYSTEM!="input", GOTO="xorg_evdev_end"
KERNEL!="event*", GOTO="xorg_evdev_end"
commit 7656675298b512645a06a34a7994dfbde9796ae4
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 8 13:03:13 2009 +0100
The -dev package doesn't need to depend on the driver itself
diff --git a/debian/control b/debian/control
index 087d1bb..c184fec 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Description: X.Org X server -- evdev input driver
Package: xserver-xorg-input-evdev-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-input-evdev (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X.Org X server -- evdev input driver (development headers)
This package provides the development headers for the evdev input driver
found in xserver-xorg-input-evdev. Non-developers likely have little use
commit 56eca3a002730c85369b42b0be4e7954f1e220c1
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 8 13:59:55 2009 +0200
Add xserver-xorg-input-evdev-dev for the header and .pc files.
diff --git a/debian/changelog b/debian/changelog
index e30c6fe..562d904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.3.1-2) UNRELEASED; urgency=low
* Build against Xserver 1.7.
* Run udevadm trigger on postinst, and depend on udev [linux-any].
+ * Add xserver-xorg-input-evdev-dev for the header and .pc files.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Dec 2009 13:47:20 +0200
diff --git a/debian/control b/debian/control
index b2692c1..087d1bb 100644
--- a/debian/control
+++ b/debian/control
@@ -38,3 +38,19 @@ Description: X.Org X server -- evdev input driver
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
This package is built from the X.org xf86-input-evdev driver module.
+
+Package: xserver-xorg-input-evdev-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-input-evdev (= ${binary:Version})
+Description: X.Org X server -- evdev input driver (development headers)
+ This package provides the development headers for the evdev input driver
+ found in xserver-xorg-input-evdev. Non-developers likely have little use
+ for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This package is built from the X.org xf86-input-evdev driver module.
diff --git a/debian/xserver-xorg-input-evdev-dev.install b/debian/xserver-xorg-input-evdev-dev.install
new file mode 100644
index 0000000..5bda613
--- /dev/null
+++ b/debian/xserver-xorg-input-evdev-dev.install
@@ -0,0 +1,3 @@
+usr/include/xorg/*
+usr/lib/pkgconfig/xorg-evdev.pc
+
commit 87a95569ab27180b3cc3a5ab267e81d1c6377997
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 8 13:48:13 2009 +0200
Run udevadm trigger on postinst, and depend on udev [linux-any].
diff --git a/debian/changelog b/debian/changelog
index 74d83e8..e30c6fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-input-evdev (1:2.3.1-2) UNRELEASED; urgency=low
* Build against Xserver 1.7.
+ * Run udevadm trigger on postinst, and depend on udev [linux-any].
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 02:03:39 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Dec 2009 13:47:20 +0200
xserver-xorg-input-evdev (1:2.3.1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index cbcb073..b2692c1 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.g
Package: xserver-xorg-input-evdev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
+ udev [linux-any],
Provides: ${xinpdriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- evdev input driver
diff --git a/debian/xserver-xorg-input-evdev.postinst.in b/debian/xserver-xorg-input-evdev.postinst.in
new file mode 100644
index 0000000..2d7e9a6
--- /dev/null
+++ b/debian/xserver-xorg-input-evdev.postinst.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xserver-xorg-input-evdev
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+ configure)
+ if dpkg --compare-versions "$2" lt 1:2.3.1-2; 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 662754fa39602060dd204fe7bc844361f16e1bcf
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:07:49 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index b3a899a..74d83e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.3.1-2) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.7.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 02:03:39 +0200
+
xserver-xorg-input-evdev (1:2.3.1-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 82faedc..cbcb073 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
quilt,
- xserver-xorg-dev (>= 2:1.6.99.900),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-input-dev,
commit bd4102af6e168c1b9129301f88e9601f8f5e0848
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 1 15:44:39 2009 +1000
Fix up BTN_TOUCH handling for non-button tablets.
BTN_TOOL_* is treated as tool, just like before. BTN_TOUCH on the other hand
may need to be treated as a button left press. This again requires a button
class.
Tested on an HP Touchsmart and a Wacom tablet.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 1b0df04abe329433658c95debdafdf1714173814)
diff --git a/src/evdev.c b/src/evdev.c
index 9470ea8..faab8f3 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -617,7 +617,6 @@ EvdevProcessKeyEvent(InputInfoPtr pInfo, struct input_event *ev)
return;
switch (ev->code) {
- case BTN_TOUCH:
case BTN_TOOL_PEN:
case BTN_TOOL_RUBBER:
case BTN_TOOL_BRUSH:
@@ -627,7 +626,11 @@ EvdevProcessKeyEvent(InputInfoPtr pInfo, struct input_event *ev)
case BTN_TOOL_MOUSE:
case BTN_TOOL_LENS:
pEvdev->tool = value ? ev->code : 0;
- if (!(pEvdev->flags & EVDEV_TOUCHSCREEN))
+ break;
+
+ case BTN_TOUCH:
+ pEvdev->tool = value ? ev->code : 0;
+ if (!(pEvdev->flags & (EVDEV_TOUCHSCREEN | EVDEV_TABLET)))
break;
/* Treat BTN_TOUCH from devices that only have BTN_TOUCH as
* BTN_LEFT. */
@@ -1929,6 +1932,11 @@ EvdevProbe(InputInfoPtr pInfo)
{
xf86Msg(X_INFO, "%s: Found absolute tablet.\n", pInfo->name);
pEvdev->flags |= EVDEV_TABLET;
+ if (!pEvdev->num_buttons)
+ {
+ pEvdev->num_buttons = 7; /* LMR + scroll wheels */
+ pEvdev->flags |= EVDEV_BUTTON_EVENTS;
+ }
} else if (TestBit(ABS_PRESSURE, pEvdev->abs_bitmask) ||
TestBit(BTN_TOUCH, pEvdev->key_bitmask)) {
if (num_buttons || TestBit(BTN_TOOL_FINGER, pEvdev->key_bitmask)) {
commit 22e816eb326a5495a5dc6e0a94394534d6645bae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 1 14:16:10 2009 +1000
Only init the calibration property for absolute devices.
Relative devices can't be calibrated anyway so why bother.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 2ca24a16f08095f35d5610f16e202c525b3075e9)
diff --git a/src/evdev.c b/src/evdev.c
index d37889d..9470ea8 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2522,7 +2522,7 @@ EvdevInitProperty(DeviceIntPtr dev)
rc = XIChangeDeviceProperty(dev, prop_calibration, XA_INTEGER,
32, PropModeReplace, 4, calibration,
FALSE);
- } else {
+ } else if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) {
rc = XIChangeDeviceProperty(dev, prop_calibration, XA_INTEGER,
32, PropModeReplace, 0, NULL,
FALSE);
commit b6b377fe9afa51ee8cbef8e9830537806e94a3ac
Author: David Woodhouse <dwmw2@infradead.org>
Date: Tue Dec 1 00:14:54 2009 +0000
Report initial calibration parameters.
Where an initial calibration is provided through the Calibration option
to the driver, it wasn't being exposed in the 'Evdev Axis Calibration'
property. Remedy that...
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 7b285a802b8ccddd1edcf40ab345c4a96bcdf43c)
diff --git a/src/evdev.c b/src/evdev.c
index bf0e760..d37889d 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2511,8 +2511,22 @@ EvdevInitProperty(DeviceIntPtr dev)
prop_calibration = MakeAtom(EVDEV_PROP_CALIBRATION,
strlen(EVDEV_PROP_CALIBRATION), TRUE);
- rc = XIChangeDeviceProperty(dev, prop_calibration, XA_INTEGER, 32,
- PropModeReplace, 0, NULL, FALSE);
+ if (pEvdev->flags & EVDEV_CALIBRATED) {
+ int calibration[4];
+
+ calibration[0] = pEvdev->calibration.min_x;
+ calibration[1] = pEvdev->calibration.max_x;
+ calibration[2] = pEvdev->calibration.min_y;
+ calibration[3] = pEvdev->calibration.max_y;
+
+ rc = XIChangeDeviceProperty(dev, prop_calibration, XA_INTEGER,
+ 32, PropModeReplace, 4, calibration,
+ FALSE);
+ } else {
+ rc = XIChangeDeviceProperty(dev, prop_calibration, XA_INTEGER,
+ 32, PropModeReplace, 0, NULL,
+ FALSE);
+ }
if (rc != Success)
return;
commit 3772676fd65065b43a94234127537ab5030b09f8
Author: David Woodhouse <dwmw2@infradead.org>
Date: Tue Dec 1 00:12:36 2009 +0000
Swap axes before applying touch screen calibration.
When the SwapAxes option is set, the X and Y axes in calibration should
be labelled as the user perceives them -- not as the kernel sends them.
Currently, we apply the X-axis calibration to the X-axis of the input,
and then do the axis swapping so we've actually applied the X-axis
calibration to what the user sees as the Y-axis.
This patch changes the order of the operations, so that the axes are
swapped before the calibration is applied.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit f187badb71554a73bf9ca30ce75c9d166e688f03)
diff --git a/src/evdev.c b/src/evdev.c
index 33e02ab..bf0e760 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -464,6 +464,13 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v,
*/
else if (pEvdev->abs && pEvdev->tool) {
memcpy(v, pEvdev->vals, sizeof(int) * pEvdev->num_vals);
+
+ if (pEvdev->swap_axes) {
+ int tmp = v[0];
+ v[0] = v[1];
+ v[1] = tmp;
+ }
+
if (pEvdev->flags & EVDEV_CALIBRATED)
{
v[0] = xf86ScaleAxis(v[0],
@@ -476,12 +483,6 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v,
pEvdev->calibration.max_y, pEvdev->calibration.min_y);
}
- if (pEvdev->swap_axes) {
- int tmp = v[0];
- v[0] = v[1];
- v[1] = tmp;
- }
-
if (pEvdev->invert_x)
v[0] = (pEvdev->absinfo[ABS_X].maximum - v[0] +
pEvdev->absinfo[ABS_X].minimum);
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 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
Reply to: