[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.6.5-1

[Guido Günther]

The following commit has been merged in the master branch:
commit f94fb482d0a42aec53841c66687dd5e5df6e3a61
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Jul 4 21:37:20 2009 +0200

    drop 0005-allow-to-qemu-to-emulate-arm.patch
    
    fixed upstream.

diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index 120b7f4..fc5f514 100644
--- a/debian/patches/0002-qemu-disable-network.diff.patch
+++ b/debian/patches/0002-qemu-disable-network.diff.patch
@@ -22,10 +22,10 @@ index 403846a..c3f41d4 100644
  	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
  	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
 diff --git a/qemud/Makefile.in b/qemud/Makefile.in
-index dbc6bb3..e8dfa5b 100644
+index ed8cea0..bb1e1bd 100644
 --- a/qemud/Makefile.in
 +++ b/qemud/Makefile.in
-@@ -1307,9 +1307,6 @@ remote_protocol.c: remote_protocol.h
+@@ -1375,9 +1375,6 @@ remote_protocol.c: remote_protocol.h
  @WITH_LIBVIRTD_TRUE@	test -z "$(UUID)" || \
  @WITH_LIBVIRTD_TRUE@	  sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
  @WITH_LIBVIRTD_TRUE@	    $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
diff --git a/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch b/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
index 1dfd88c..2923b1f 100644
--- a/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] allow libvirt group to access the socket
  1 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/qemud/libvirtd.conf b/qemud/libvirtd.conf
-index 1fd5918..a26c081 100644
+index 49de466..cc5f056 100644
 --- a/qemud/libvirtd.conf
 +++ b/qemud/libvirtd.conf
 @@ -78,7 +78,7 @@
diff --git a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
index 8dcaca9..18ea31b 100644
--- a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
@@ -8,10 +8,10 @@ Closes: #517059
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/xen_internal.c b/src/xen_internal.c
-index 06b0cba..252772d 100644
+index cc5a8f9..63b8785 100644
 --- a/src/xen_internal.c
 +++ b/src/xen_internal.c
-@@ -2202,7 +2202,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2212,7 +2212,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
                                                "/usr/lib64/xen/bin/qemu-dm" :
                                                "/usr/lib/xen/bin/qemu-dm"),
                                               (guest_archs[i].hvm ?
diff --git a/debian/patches/0005-allow-to-qemu-to-emulate-arm.patch b/debian/patches/0005-allow-to-qemu-to-emulate-arm.patch
deleted file mode 100644
index 6f8db74..0000000
--- a/debian/patches/0005-allow-to-qemu-to-emulate-arm.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: C.J. Adams-Collier <cjac at colliertech.org>
-Date: Fri, 3 Jul 2009 19:12:55 +0200
-Subject: [PATCH] allow to qemu to emulate arm
-
----
- src/qemu_conf.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index d54f2ca..15f9795 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -186,6 +186,12 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
- static const char *const arch_info_hvm_x86_machines[] = {
-     "pc", "isapc"
- };
-+static const char *const arch_info_hvm_arm_machines[] = {
-+  "versatilepb","integratorcp","versatileab","realview",
-+  "akita","spitz","borzoi","terrier","sx1-v1","sx1",
-+  "cheetah","n800","n810","lm3s811evb","lm3s6965evb",
-+  "connex","verdex","mainstone","musicpal","tosa",
-+};
- static const char *const arch_info_hvm_mips_machines[] = {
-     "mips"
- };
-@@ -236,6 +242,8 @@ static const struct qemu_arch_info const arch_info_hvm[] = {
-        "/usr/bin/qemu", "/usr/bin/qemu-system-x86_64", arch_info_i686_flags, 4 },
-     {  "x86_64", 64, arch_info_hvm_x86_machines, 2,
-        "/usr/bin/qemu-system-x86_64", NULL, arch_info_x86_64_flags, 2 },
-+    {  "arm", 32, arch_info_hvm_arm_machines, 20,
-+       "/usr/bin/qemu-system-arm", NULL, NULL, 0 },
-     {  "mips", 32, arch_info_hvm_mips_machines, 1,
-        "/usr/bin/qemu-system-mips", NULL, NULL, 0 },
-     {  "mipsel", 32, arch_info_hvm_mips_machines, 1,
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 5396c6d..a8c0f9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 0002-qemu-disable-network.diff.patch
 0003-allow-libvirt-group-to-access-the-socket.patch
 0004-fix-Debian-specific-path-to-hvm-loader.patch
-0005-allow-to-qemu-to-emulate-arm.patch

-- 
Libvirt Debian packaging