xorg-server: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 debian/changelog                                         |    6 ++++++
 debian/patches/12-Add-libudev-input-hotplug-backend.diff |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c1a255066369f63450b5a34f89c71bda8eb60214
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Feb 18 19:15:12 2010 +0100

    config/udev: fix adding unnamed devices.

diff --git a/debian/changelog b/debian/changelog
index 7e01ab1..6cc58c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.7.5-2) UNRELEASED; urgency=low
+
+  * config/udev: fix adding unnamed devices.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 18 Feb 2010 19:14:51 +0100
+
 xorg-server (2:1.7.5-1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/patches/12-Add-libudev-input-hotplug-backend.diff b/debian/patches/12-Add-libudev-input-hotplug-backend.diff
index 8c57195..ee27620 100644
--- a/debian/patches/12-Add-libudev-input-hotplug-backend.diff
+++ b/debian/patches/12-Add-libudev-input-hotplug-backend.diff
@@ -382,7 +382,7 @@ Index: xorg-server/config/udev.c
 +    parent = udev_device_get_parent(udev_device);
 +    if (parent)
 +        name = udev_device_get_property_value(parent, "NAME");
-+    else
++    if (!name)
 +        name = "(unnamed)";
 +
 +    if (!driver || !path || !syspath)