xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/patches/15-keep-udev-x11-driver.diff | 19 +++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 26 insertions(+)
New commits:
commit 9411a81e45bd9d986b84e4635df826ded728335f
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Mar 30 14:24:04 2010 +0200
15-keep-udev-x11-driver.diff: keep looking for the x11_driver udev property
Transitional measure, to be removed once all drivers are updated. This
should allow the new server to work while drivers aren't transitioned to
xorg.conf.d yet.
diff --git a/debian/changelog b/debian/changelog
index b781f32..96483d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xorg-server (2:1.7.6-2) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Add 08-config-xorg-conf-d.diff, 09-inputclass-sans-abi9.diff,
10-config-libudev-backend.diff. Backport xorg.conf.d, inputclass
and libudev support from xserver 1.8. Replaces the patches we had
@@ -15,6 +16,11 @@ xorg-server (2:1.7.6-2) UNRELEASED; urgency=low
don't break the input ABI.
* Add 14-tone-down-nidr-errors.diff. Use X_INFO instead of X_ERROR.
+ [ Julien Cristau ]
+ * 15-keep-udev-x11-driver.diff: keep looking for the x11_driver udev
+ property as a transitional measure. This should allow the new server to
+ work while drivers aren't transitioned to xorg.conf.d yet.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 24 Mar 2010 16:08:25 +0200
xorg-server (2:1.7.6-1) unstable; urgency=low
diff --git a/debian/patches/15-keep-udev-x11-driver.diff b/debian/patches/15-keep-udev-x11-driver.diff
new file mode 100644
index 0000000..7aa8c0a
--- /dev/null
+++ b/debian/patches/15-keep-udev-x11-driver.diff
@@ -0,0 +1,19 @@
+From: Julien Cristau <jcristau@debian.org>
+Subject: Keep looking for x11_driver in udev for now
+
+Our drivers don't ship xorg.conf.d snippets for now, so keep using
+x11_driver from udev in the transition period.
+
+Index: xorg-server/config/udev.c
+===================================================================
+--- xorg-server.orig/config/udev.c
++++ xorg-server/config/udev.c
+@@ -118,6 +118,8 @@
+ add_option(&options, "xkb_model", value);
+ else if (!strcasecmp(tmp, "options"))
+ add_option(&options, "xkb_options", value);
++ } else if (!strcmp(key, "x11_driver")) {
++ add_option(&options, "driver", value);
+ } else if (!strcmp(key, "ID_VENDOR")) {
+ attrs.vendor = value;
+ } else if (!strcmp(key, "ID_INPUT_KEY")) {
diff --git a/debian/patches/series b/debian/patches/series
index e3f46b8..f6afe60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
12-xfree86-dont-complain-about-missing-coredevices.diff
13-unbreak-input-abi.diff
14-tone-down-nidr-errors.diff
+15-keep-udev-x11-driver.diff
Reply to: