debian/changelog                                       |    5 ++
 debian/patches/16-config-dont-filter-input-subsys.diff |   42 +++++++++++++++++
 debian/patches/series                                  |    1 
 3 files changed, 48 insertions(+)

New commits:
commit 49d38c213ce48640cd4812c57efe7f4a124f5327
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date:   Tue Feb 23 14:54:34 2010 +0200

    Add 16-config-dont-filter-input-subsys.diff so for instance serial wacom 
devices are initialized by the udev backend (LP: #522318).

diff --git a/debian/changelog b/debian/changelog
index 6cc58c9..d4d509f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 xorg-server (2:1.7.5-2) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * config/udev: fix adding unnamed devices.
 
+  [ Timo Aaltonen ]
+  * Add 16-config-dont-filter-input-subsys.diff so for instance serial
+    wacom devices are initialized by the udev backend (LP: #522318).
+
  -- Julien Cristau <jcris...@debian.org>  Thu, 18 Feb 2010 19:14:51 +0100
 
 xorg-server (2:1.7.5-1) unstable; urgency=low
diff --git a/debian/patches/16-config-dont-filter-input-subsys.diff 
b/debian/patches/16-config-dont-filter-input-subsys.diff
new file mode 100644
index 0000000..3f9400c
--- /dev/null
+++ b/debian/patches/16-config-dont-filter-input-subsys.diff
@@ -0,0 +1,42 @@
+From 84905007702da2c05a4f7446b3fc5ff52be49655 Mon Sep 17 00:00:00 2001
+From: Thomas Jaeger <thjae...@gmail.com>
+Date: Mon, 04 Jan 2010 20:00:49 +0000
+Subject: udev: Don't filter subsystem "input"
+
+This allows serial wacom devices to work, whose subsystem is "tty".
+
+Signed-off-by: Thomas Jaeger <thjae...@gmail.com>
+Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+---
+Index: xorg-server/config/udev.c
+===================================================================
+--- xorg-server.orig/config/udev.c     2010-02-23 14:49:01.000000000 +0200
++++ xorg-server/config/udev.c  2010-02-23 14:49:01.000000000 +0200
+@@ -191,7 +191,6 @@
+     struct udev *udev;
+     struct udev_enumerate *enumerate;
+     struct udev_list_entry *devices, *device;
+-    int rc;
+ 
+     udev = udev_new();
+     if (!udev)
+@@ -199,10 +198,6 @@
+     udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
+     if (!udev_monitor)
+         return 0;
+-    rc = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor,
+-                                                         "input", NULL);
+-    if (rc < 0)
+-        return 0;
+ 
+     if (udev_monitor_enable_receiving(udev_monitor)) {
+         ErrorF("config/udev: failed to bind the udev monitor\n");
+@@ -212,7 +207,6 @@
+     enumerate = udev_enumerate_new(udev);
+     if (!enumerate)
+         return 0;
+-    udev_enumerate_add_match_subsystem(enumerate, "input");
+     udev_enumerate_scan_devices(enumerate);
+     devices = udev_enumerate_get_list_entry(enumerate);
+     udev_list_entry_foreach(device, devices) {
diff --git a/debian/patches/series b/debian/patches/series
index 047e43d..f38fd97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 13-configure-config-udev-defaults-to-off-for-now.diff
 14-config-add-example-udev-rules.diff
 15-config-udev-look-for-xkb-rules-model-layout-variant-.diff
+16-config-dont-filter-input-subsys.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1njuhg-0008hu...@alioth.debian.org

Reply via email to