part 1 of 2.4 patch update series

[pve-qemu-kvm.git] / debian / patches / keymap.diff

diff --git a/debian/patches/keymap.diff b/debian/patches/keymap.diff
index 5a4206d0089735bbddf316dc57011806c4d16c1f..682cb9bc4c14525cbba1cd80b245cd94e0ecffce 100644 (file)
--- a/debian/patches/keymap.diff
+++ b/debian/patches/keymap.diff
@@ -1,8 +1,8 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c  2014-06-17 06:14:28.000000000 +0200
-+++ new/ui/vnc.c       2014-06-17 06:14:54.000000000 +0200
-@@ -1626,6 +1626,10 @@
+--- new.orig/ui/vnc.c  2014-11-20 06:45:06.000000000 +0100
++++ new/ui/vnc.c       2014-11-20 06:50:51.000000000 +0100
+@@ -1633,6 +1633,10 @@
  
  static void do_key_event(VncState *vs, int down, int keycode, int sym)
  {
@@ -13,7 +13,7 @@ Index: new/ui/vnc.c
      /* QEMU console switch */
      switch(keycode) {
      case 0x2a:                          /* Left Shift */
-@@ -1705,7 +1709,24 @@
+@@ -1712,7 +1716,24 @@
      }
  
      if (qemu_console_is_graphic(NULL)) {
@@ -38,7 +38,7 @@ Index: new/ui/vnc.c
      } else {
          bool numlock = vs->modifiers_state[0x45];
          bool control = (vs->modifiers_state[0x1d] ||
-@@ -1844,7 +1865,8 @@
+@@ -1851,7 +1872,8 @@
          lsym = lsym - 'A' + 'a';
      }
  
@@ -48,12 +48,3 @@ Index: new/ui/vnc.c
      trace_vnc_key_event_map(down, sym, keycode, code2name(keycode));
      do_key_event(vs, down, keycode, sym);
  }
-@@ -3036,7 +3058,7 @@
- char *vnc_display_local_addr(DisplayState *ds)
- {
-     VncDisplay *vs = vnc_display;
--    
-+
-     return vnc_socket_local_addr("%s:%s", vs->lsock);
- }
-