xserver-xorg-input-evdev: Changes to 'debian-unstable'

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

 debian/changelog |    7 +++++++
 src/evdev_key.c  |    6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 63a37ecf4a892d5088efe7d47d764f629584fd8e
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jul 7 19:30:00 2007 +0200

    Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index aed8d66..a8c4c38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
+
+  * Cherry-pick commit 987c6b15: don't call xf86OSRingBell() which isn't
+    available anymore (closes: #430539).
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 07 Jul 2007 19:21:43 +0200
+
 xserver-xorg-input-evdev (1:1.1.5-2) unstable; urgency=low
 
   [ Julien Cristau ]

commit 987f6f9920d6ded4edf71d3808c4508af4b5bec3
Author: root <root@agamemnon.b5>
Date:   Thu Jan 11 22:41:23 2007 -0500

    No more call to xf86OSRingBell in any cases,
     maybe do some conditional stuff later.
    (cherry picked from commit 987c6b1597f184e035c3ecef15a776f7c64cd4fe)

diff --git a/src/evdev_key.c b/src/evdev_key.c
index f840d1a..f448e35 100644
--- a/src/evdev_key.c
+++ b/src/evdev_key.c
@@ -235,14 +235,18 @@ static KeySym map[] = {
 
 /*
  * FIXME: We have no way of ringing the bell ourselves.
- * So use the system bell for now.
+ *
+ * And recent versions of X don't have the system call.
+ * Who cares.
  */
 static void
 EvdevKbdBell (int percent, DeviceIntPtr device, pointer arg, int unused)
 {
+#if 0
     KeybdCtrl *ctrl = arg;
 
     xf86OSRingBell(percent, ctrl->bell_pitch, ctrl->bell_duration);
+#endif
 }
 
 static void