[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.7.6-2-5-g313946f

[Laurent Léonard]

The following commit has been merged in the master branch:
commit bd457ccf966218b9126a44bac4195002211c41b0
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Fri Mar 5 17:45:05 2010 +0100

    Redo patches.

diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index 1c20b77..55f9d87 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 10f622f..f76b8e5 100644
+index 8f6df19..d5096a4 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 a319ea7..9cd31d7 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 3232256..f7a793a 100644
+index 67f8b6d..760548d 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -923,9 +923,6 @@ if WITH_NETWORK
+@@ -928,9 +928,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 3232256..f7a793a 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index c244753..06d6d20 100644
+index 2ec4626..9da317b 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -4283,9 +4283,6 @@ install-data-local:
+@@ -4323,9 +4323,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 b134e48..f224208 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 16c91e1..633f6af 100644
+index ab8fbc3..bff4a1d 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
 @@ -2288,7 +2288,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 6fa72a4..40c254e 100644
--- a/debian/patches/0005-Terminate-nc-on-EOF.patch
+++ b/debian/patches/0005-Terminate-nc-on-EOF.patch
@@ -8,10 +8,10 @@ Closes: #564053
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index d6f5fce..a4055f8 100644
+index b7b2e09..d8d363e 100644
 --- a/src/remote/remote_driver.c
 +++ b/src/remote/remote_driver.c
-@@ -730,7 +730,7 @@ doRemoteOpen (virConnectPtr conn,
+@@ -733,7 +733,7 @@ doRemoteOpen (virConnectPtr conn,
      }
  
      case trans_ssh: {
@@ -20,7 +20,7 @@ index d6f5fce..a4055f8 100644
  
          if (username) nr_args += 2; /* For -l username */
          if (no_tty) nr_args += 5;   /* For -T -o BatchMode=yes -e none */
-@@ -764,6 +764,8 @@ doRemoteOpen (virConnectPtr conn,
+@@ -767,6 +767,8 @@ doRemoteOpen (virConnectPtr conn,
          }
          cmd_argv[j++] = strdup (priv->hostname);
          cmd_argv[j++] = strdup (netcat ? netcat : "nc");
diff --git a/debian/patches/0006-Don-t-drop-caps-when-exec-ing-qemu.patch b/debian/patches/0006-Don-t-drop-caps-when-exec-ing-qemu.patch
index c9f7819..4661097 100644
--- a/debian/patches/0006-Don-t-drop-caps-when-exec-ing-qemu.patch
+++ b/debian/patches/0006-Don-t-drop-caps-when-exec-ing-qemu.patch
@@ -8,12 +8,12 @@ Closes: #565767
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 1e796ef..99fdeb3 100644
+index 4707f72..2c99ce8 100644
 --- a/src/qemu/qemu_driver.c
 +++ b/src/qemu/qemu_driver.c
-@@ -2697,7 +2697,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+@@ -2855,7 +2855,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
  
-     ret = virExecDaemonize(conn, argv, progenv, &keepfd, &child,
+     ret = virExecDaemonize(argv, progenv, &keepfd, &child,
                             stdin_fd, &logfile, &logfile,
 -                           VIR_EXEC_NONBLOCK | VIR_EXEC_CLEAR_CAPS,
 +                           VIR_EXEC_NONBLOCK /* | VIR_EXEC_CLEAR_CAPS */,

-- 
Libvirt Debian packaging