xorg-server: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/patches/229_udev-fix.diff | 17 +++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 80bb00122610f745c172fe0c9fd707c75833cc9b
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Sep 17 16:24:55 2012 +0300
Try again with the right hotplug patch.
diff --git a/debian/changelog b/debian/changelog
index 48b0ca7..6b94c18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.13.0-0ubuntu3) quantal; urgency=low
+
+ * Try again with the right hotplug patch.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 17 Sep 2012 16:24:29 +0300
+
xorg-server (2:1.13.0-0ubuntu2) quantal; urgency=low
[ Maarten Lankhorst ]
diff --git a/debian/patches/229_udev-fix.diff b/debian/patches/229_udev-fix.diff
index 3b5bf0b..6cd0e22 100644
--- a/debian/patches/229_udev-fix.diff
+++ b/debian/patches/229_udev-fix.diff
@@ -11,7 +11,7 @@ Signed-off-by: Dave Airlie <airlied@redhat.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/config/udev.c b/config/udev.c
-index 03aca28..4a77983 100644
+index 03aca28..2adb613 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -300,9 +300,15 @@ wakeup_handler(pointer data, int err, pointer read_mask)
@@ -20,14 +20,15 @@ index 03aca28..4a77983 100644
if (action) {
- if (!strcmp(action, "add") || !strcmp(action, "change")) {
+ if (!strcmp(action, "add")) {
- device_removed(udev_device);
- device_added(udev_device);
+ device_removed(udev_device);
+ device_added(udev_device);
+ } else if (!strcmp(action, "change")) {
-+ /* ignore change for the drm devices */
-+ if (strcmp(udev_device_get_subsystem(udev_device), "drm")) {
-+ device_removed(udev_device);
-+ device_added(udev_device);
-+ }
++ /* ignore change for the drm devices */
++ if (strcmp(udev_device_get_subsystem(udev_device), "drm")) {
++ device_removed(udev_device);
++ device_added(udev_device);
++ }
}
else if (!strcmp(action, "remove"))
device_removed(udev_device);
+-- 1.7.11.4
Reply to: