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

[Laurent Léonard]

The following commit has been merged in the master branch:
commit f8089a1fc48345c3fa74e544aeae21ad7aedf2ed
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Wed Dec 23 18:22:22 2009 +0100

    Redo patches.

diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index f0a4e52..9557090 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/tools/virsh.pod b/tools/virsh.pod
-index 6ff0151..7fafe13 100644
+index ee8cc11..d2458f5 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -34,7 +34,7 @@ the program.
diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index 3d481d5..eb39b33 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/src/Makefile.am b/src/Makefile.am
-index 26be8e2..ac3c5ea 100644
+index 8ef0e81..f59eb08 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -887,9 +887,6 @@ if WITH_NETWORK
+@@ -913,9 +913,6 @@ if WITH_NETWORK
  	test -z "$(UUID)" || \
  	  sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
  	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
@@ -22,10 +22,10 @@ index 26be8e2..ac3c5ea 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 3a9c662..a401cd9 100644
+index 5301dfc..143fe64 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -3927,9 +3927,6 @@ install-data-local:
+@@ -4197,9 +4197,6 @@ install-data-local:
  @WITH_NETWORK_TRUE@	test -z "$(UUID)" || \
  @WITH_NETWORK_TRUE@	  sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
  @WITH_NETWORK_TRUE@	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
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 98bf4bf..f3b95d2 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,7 +12,7 @@ Closes: #517059
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 843102a..79537d4 100644
+index 8279a74..5001d91 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
 @@ -2230,7 +2230,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,

-- 
Libvirt Debian packaging