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

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 9a8afd0efbdb50a74ce6340801ae46cbf54ae52d
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Thu Aug 6 21:25:12 2009 +0200

    Redo patches.

diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index edf8767..0453f64 100644
--- a/debian/patches/0001-remove-RHism.diff.patch
+++ b/debian/patches/0001-remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] remove-RHism.diff
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virsh.1 b/virsh.1
-index 45ea614..321adeb 100644
+index ca03cc1..ffec62c 100644
 --- a/virsh.1
 +++ b/virsh.1
 @@ -171,7 +171,7 @@ the program.
diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index fc5f514..fe03be0 100644
--- a/debian/patches/0002-qemu-disable-network.diff.patch
+++ b/debian/patches/0002-qemu-disable-network.diff.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] qemu-disable-network.diff
  2 files changed, 0 insertions(+), 6 deletions(-)
 
 diff --git a/qemud/Makefile.am b/qemud/Makefile.am
-index 403846a..c3f41d4 100644
+index 959ff88..324fb4a 100644
 --- a/qemud/Makefile.am
 +++ b/qemud/Makefile.am
-@@ -161,9 +161,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
+@@ -166,9 +166,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
  	test -z "$(UUID)" || \
  	  sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
  	    $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
@@ -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 ed8cea0..bb1e1bd 100644
+index 471d356..c2b314f 100644
 --- a/qemud/Makefile.in
 +++ b/qemud/Makefile.in
-@@ -1375,9 +1375,6 @@ remote_protocol.c: remote_protocol.h
+@@ -1462,9 +1462,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/0004-fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
index 2769114..1150a5e 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
@@ -12,10 +12,10 @@ Closes: #517059
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/xen_internal.c b/src/xen_internal.c
-index cc5a8f9..63b8785 100644
+index b6bf10d..6168120 100644
 --- a/src/xen_internal.c
 +++ b/src/xen_internal.c
-@@ -2212,7 +2212,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2216,7 +2216,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
                                                "/usr/lib64/xen/bin/qemu-dm" :
                                                "/usr/lib/xen/bin/qemu-dm"),
                                               (guest_archs[i].hvm ?
@@ -23,7 +23,7 @@ index cc5a8f9..63b8785 100644
 +                                              "/usr/lib/xen-default/boot/hvmloader" :
                                                NULL),
                                               1,
-                                              machines)) == NULL)
+                                              machines)) == NULL) {
 diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
 index 42b099c..2886c09 100644
 --- a/tests/xencapsdata/xen-i686-pae-hvm.xml

-- 
Libvirt Debian packaging