[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, bpo-etch, updated. debian/0.4.6-10-16-g4e730fe

[Guido Guenther]

The following commit has been merged in the bpo-etch branch:
commit d909f9c95897231f01b337fdef9d7f9776f698ae
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Dec 20 19:43:14 2008 +0100

    fix qemu detection for etch's qemu 0.8.2

diff --git a/debian/patches/0013-use-h-instead-of-help.patch b/debian/patches/0013-use-h-instead-of-help.patch
new file mode 100644
index 0000000..d7afb42
--- /dev/null
+++ b/debian/patches/0013-use-h-instead-of-help.patch
@@ -0,0 +1,25 @@
+From e90c5fcdc86060856cc9204b1e656bd25bb8141c Mon Sep 17 00:00:00 2001
+From: Guido Günther <agx at sigxcpu.org>
+Date: Sat, 20 Dec 2008 18:54:35 +0100
+Subject: [PATCH] use -h instead of -help
+
+---
+ src/qemu_conf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 23ef050..5d2ced6 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -419,7 +419,7 @@ virCapsPtr qemudCapsInit(void) {
+ int qemudExtractVersionInfo(const char *qemu,
+                             unsigned int *retversion,
+                             unsigned int *retflags) {
+-    const char *const qemuarg[] = { qemu, "-help", NULL };
++    const char *const qemuarg[] = { qemu, "-h", NULL };
+     const char *const qemuenv[] = { "LC_ALL=C", NULL };
+     pid_t child;
+     int newstdout = -1;
+-- 
+1.5.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
index d052ab2..4ae4112 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0011-Fix-missing-read-only-access-checks-CVE-2008-5086.patch
 0005-include-bits-siginfo.h-for-siginfo_t.patch
 0001-drop-unused-anonymous-unions-and-empty-structs.patch
+0013-use-h-instead-of-help.patch

-- 
Libvirt debian packaging