[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-evdev: Changes to 'debian-unstable'



 debian/changelog           |    1 +
 debian/local/05-evdev.conf |   39 +++++++++++++++++++++++++++++++++++++++
 debian/rules               |    4 ++++
 3 files changed, 44 insertions(+)

New commits:
commit 941e6cdbe1baaf60aa3f07da39a1642357a02a81
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Tue Mar 30 14:35:09 2010 +0300

    Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d.

diff --git a/debian/changelog b/debian/changelog
index 405c8fd..4921e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low
 
   * 65-xorg-evdev.rules: Check for ID_INPUT_TABLET too, and set x11_driver
     if found.
+  * Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Sun, 21 Mar 2010 20:51:38 +0200
 
diff --git a/debian/local/05-evdev.conf b/debian/local/05-evdev.conf
new file mode 100644
index 0000000..877aa4a
--- /dev/null
+++ b/debian/local/05-evdev.conf
@@ -0,0 +1,39 @@
+# Catchall classes for input devices
+# We don't simply match on any device since that also adds accelerometers
+# and other devices that we don't really want to use. The list below
+# matches everything but joysticks.
+
+Section "InputClass"
+        Identifier "evdev pointer catchall"
+        MatchIsPointer "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchpad catchall"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev tablet catchall"
+        MatchIsTablet "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchscreen catchall"
+        MatchIsTouchscreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
diff --git a/debian/rules b/debian/rules
index c1aa6ff..32ba6a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,10 @@ binary-arch: build install serverabi
 	install -m 644 debian/local/65-xorg-evdev.rules debian/xserver-xorg-input-evdev/lib/udev/rules.d/
 	install -d debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d
 	install -m 644 debian/local/65-xorg-evdev.rules debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d/
+	install -d debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
+	install -m 644 debian/local/05-evdev.conf debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
+	install -d debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d
+	install -m 644 debian/local/05-evdev.conf debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d
 	dh_installman
 	dh_link
 	dh_strip


Reply to: