From fa7ae705056da0f20fb90001ed3513b45d9863d3 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 23 Nov 2012 07:45:46 +0100
Subject: [PATCH] fix version parser for qemu 1.3

---
 Makefile          | 2 +-
 PVE/QemuServer.pm | 2 +-
 changelog.Debian  | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c4b87e9e..4ff3332e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.2
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=69
+PKGREL=70
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index b67d259c..3f190300 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -648,7 +648,7 @@ sub kvm_user_version {
 
     my $tmp = `kvm -help 2>/dev/null`;
 
-    if ($tmp =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?) /) {
+    if ($tmp =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?)[,\s]/) {
 	$kvm_user_version = $2;
     }
 
diff --git a/changelog.Debian b/changelog.Debian
index 46dcc434..9bd702e4 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-70) unstable; urgency=low
+
+  * fix version parser for qemu 1.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 23 Nov 2012 07:45:19 +0100
+
 qemu-server (2.0-69) unstable; urgency=low
 
   * fix ballon monitor command (use bytes instead of MBs)