[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.8.3-1-5-gcce7327

Laurent Léonard laurent at open-minds.org
Sat Sep 11 01:23:04 UTC 2010


The following commit has been merged in the experimental branch:
commit e1dc0c7b9f39e9edd102d3b2f99d5d8c1322960f
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Fri Sep 10 18:50:06 2010 +0200

    Redo patches

diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index 4e30aed..30cdb4d 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 a66eb2a..368a782 100644
+index b321657..0795b5d 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1172,9 +1172,6 @@ if WITH_NETWORK
+@@ -1179,9 +1179,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 a66eb2a..368a782 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index febc273..3679d84 100644
+index e94d077..c812278 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -5021,9 +5021,6 @@ install-data-local:
+@@ -5033,9 +5033,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 00b5274..05a3c7b 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 67d0f4b..7facaec 100644
+index 6246513..84fd73a 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
 @@ -2287,7 +2287,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
diff --git a/debian/patches/0005-Terminate-nc-on-EOF.patch b/debian/patches/0005-Terminate-nc-on-EOF.patch
index e566cdc..27974e3 100644
--- a/debian/patches/0005-Terminate-nc-on-EOF.patch
+++ b/debian/patches/0005-Terminate-nc-on-EOF.patch
@@ -8,7 +8,7 @@ Closes: #564053
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index cb0d8e1..9ef2ab3 100644
+index a945710..df54973 100644
 --- a/src/remote/remote_driver.c
 +++ b/src/remote/remote_driver.c
 @@ -730,7 +730,7 @@ doRemoteOpen (virConnectPtr conn,

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list