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

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 780f6a7354825c01b31239146aab5fb77d624b4e
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Fri Sep 18 03:30:12 2009 +0200

    Redo patches.

diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index 0453f64..2d36508 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 ca03cc1..ffec62c 100644
+index 5731b4c..01f9e5b 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 fe03be0..a005584 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 959ff88..324fb4a 100644
+index 3d143da..e3f42c2 100644
 --- a/qemud/Makefile.am
 +++ b/qemud/Makefile.am
-@@ -166,9 +166,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
+@@ -173,9 +173,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 959ff88..324fb4a 100644
  	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
  	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
 diff --git a/qemud/Makefile.in b/qemud/Makefile.in
-index 471d356..c2b314f 100644
+index ad8b93e..8e33361 100644
 --- a/qemud/Makefile.in
 +++ b/qemud/Makefile.in
-@@ -1462,9 +1462,6 @@ remote_protocol.c: remote_protocol.h
+@@ -1519,9 +1519,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 1150a5e..65e7b10 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 b6bf10d..6168120 100644
+index 30fd8bd..c5ba835 100644
 --- a/src/xen_internal.c
 +++ b/src/xen_internal.c
-@@ -2216,7 +2216,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2211,7 +2211,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
                                                "/usr/lib64/xen/bin/qemu-dm" :
                                                "/usr/lib/xen/bin/qemu-dm"),
                                               (guest_archs[i].hvm ?

-- 
Libvirt Debian packaging