xserver-xorg-input-evdev: Changes to 'debian-unstable'
debian/changelog | 3 +--
debian/local/65-xorg-evdev.rules | 14 --------------
debian/rules | 4 ----
3 files changed, 1 insertion(+), 20 deletions(-)
New commits:
commit ce5cdb99182409cdca4a7c742d4967fcdafd97fb
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Mar 30 15:08:10 2010 +0300
Remove 65-xorg-evdev.rules, obsoleted by the above.
diff --git a/debian/changelog b/debian/changelog
index 4921e60..9e5a411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,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.
+ * Remove 65-xorg-evdev.rules, obsoleted by the above.
-- Timo Aaltonen <tjaalton@ubuntu.com> Sun, 21 Mar 2010 20:51:38 +0200
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
deleted file mode 100644
index 8d9b84a..0000000
--- a/debian/local/65-xorg-evdev.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-ACTION!="add|change", GOTO="xorg_evdev_end"
-
-# 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.
-KERNEL!="event*", GOTO="xorg_evdev_end"
-ENV{ID_INPUT}=="", GOTO="xorg_evdev_end"
-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"
-ENV{ID_INPUT_TABLET}=="?*", ENV{x11_driver}="evdev"
-
-LABEL="xorg_evdev_end"
diff --git a/debian/rules b/debian/rules
index 32ba6a6..0acce07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,10 +81,6 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la --exclude=usr/share/man/man4
- install -d debian/xserver-xorg-input-evdev/lib/udev/rules.d
- 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
Reply to: