diff -u qemu-kvm-0.12.5+noroms/debian/changelog qemu-kvm-0.12.5+noroms/debian/changelog
--- qemu-kvm-0.12.5+noroms/debian/changelog
+++ qemu-kvm-0.12.5+noroms/debian/changelog
@@ -1,3 +1,12 @@
+qemu-kvm (0.12.5+noroms-0ubuntu7.1) maverick-proposed; urgency=low
+
+  * Add caps-lock-key-up-event.patch to enable normal up/down events for
+    Caps-Lock and Num-Lock keys by setting SDL_DISABLE_LOCK_KEYS (which
+    requires SDL > 1.2.14). This fixes handling of capslock when capslock is
+    mapped to something else in host system. (LP: #427612)
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Wed, 24 Nov 2010 15:35:10 +0100
+
 qemu-kvm (0.12.5+noroms-0ubuntu7) maverick; urgency=low
 
   * Resurrect arm-host-fix-compiler-warning patch, applied in
diff -u qemu-kvm-0.12.5+noroms/debian/control qemu-kvm-0.12.5+noroms/debian/control
--- qemu-kvm-0.12.5+noroms/debian/control
+++ qemu-kvm-0.12.5+noroms/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends: debhelper (>= 7), pkg-config, quilt (>= 0.40),
- bzip2, uuid-dev, zlib1g-dev, libsdl1.2-dev, libasound2-dev, libcurl4-gnutls-dev, libgnutls-dev,
+ bzip2, uuid-dev, zlib1g-dev, libsdl1.2-dev (>= 1.2.14), libasound2-dev, libcurl4-gnutls-dev, libgnutls-dev,
  libncurses5-dev, libpci-dev, libpulse-dev, libaio-dev, nasm, texi2html, bcc, iasl,
  device-tree-compiler [powerpc], sysv-rc (>= 2.86.ds1-14.1ubuntu2), libx11-dev, libsasl2-dev
 Standards-Version: 3.8.3
diff -u qemu-kvm-0.12.5+noroms/debian/patches/series qemu-kvm-0.12.5+noroms/debian/patches/series
--- qemu-kvm-0.12.5+noroms/debian/patches/series
+++ qemu-kvm-0.12.5+noroms/debian/patches/series
@@ -10,0 +11 @@
+caps-lock-key-up-event.patch
only in patch2:
unchanged:
--- qemu-kvm-0.12.5+noroms.orig/debian/patches/caps-lock-key-up-event.patch
+++ qemu-kvm-0.12.5+noroms/debian/patches/caps-lock-key-up-event.patch
@@ -0,0 +1,33 @@
+Description: Enable normal up/down events for Caps-Lock and Num-Lock keys
+ by setting SDL_DISABLE_LOCK_KEYS (which requires SDL > 1.2.14). This fixes
+ handling of capslock when capslock is mapped to something else in host system.
+Author: Benjamin Drung <bdrung@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/427612
+
+--- a/sdl.c	2010-02-26 16:26:00 +0000
++++ b/sdl.c	2010-11-24 21:17:18 +0000
+@@ -388,12 +388,6 @@
+         else
+             modifiers_state[keycode] = 1;
+         break;
+-    case 0x45: /* num lock */
+-    case 0x3a: /* caps lock */
+-        /* SDL does not send the key up event, so we generate it */
+-        kbd_put_keycode(keycode);
+-        kbd_put_keycode(keycode | 0x80);
+-        return;
+     }
+ 
+     /* now send the key code */
+@@ -848,6 +842,10 @@
+     if (no_frame)
+         gui_noframe = 1;
+ 
++    // Enable normal up/down events for Caps-Lock and Num-Lock keys.
++    // This requires SDL >= 1.2.14
++    setenv("SDL_DISABLE_LOCK_KEYS", "1", 1);
++
+     flags = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE;
+     if (SDL_Init (flags)) {
+         fprintf(stderr, "Could not initialize SDL - exiting\n");
+