use 'da' instead of 'dk' for Danish keyboard

Qemu use that name.

diff --git a/Makefile b/Makefile
index 04b42abb5f6d6ea87521c8d88f543de42def417f..9093568c34bb95256e969d03b3fad54d80511fd6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=13
+PKGREL=14
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 4d561d167c08f0b65af0d56c250912de61a69c13..5a280e6cb3fcb153334dd4f64292d0ac01961388 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -138,8 +138,6 @@ mkdir $lock_dir;
 
 my $pcisysfs = "/sys/bus/pci";
 
-my $keymaphash = PVE::Tools::kvmkeymaps();
-
 my $confdesc = {
     onboot => {
        optional => 1,
@@ -203,7 +201,7 @@ my $confdesc = {
        optional => 1,
        type => 'string',
        description => "Keybord layout for vnc server. Default is read from the datacenter configuration file.",
-       enum => [ keys %$keymaphash ],
+       enum => PVE::Tools::kvmkeymaplist(),
        default => 'en-us',
     },
     name => {

diff --git a/changelog.Debian b/changelog.Debian
index 7b51151a57aa1b8c2067058b477745d0a11ca0cb..e43715358c0b283b3ddabb622fe7d64a0c22227d 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-14) unstable; urgency=low
+
+  * use 'da' instead of 'dk' for Danish keyboard (qemu use that name)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 09 Jan 2012 11:24:40 +0100
+
 qemu-server (2.0-13) unstable; urgency=low
 
   * load vhost_net module