[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.2-1-7-g01d3ff3

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 768daf61e44ceba7cff6a57bb51ad42d959749e1
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Thu Aug 5 01:57:11 2010 +0200

    Redo patches.

diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index 9147150..b82dae2 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 2b2227f..07ae3ba 100644
+index e0471b1..692dc29 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -42,7 +42,7 @@ the program.
diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index 5efe690..4e30aed 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 ece18a6..9c4722f 100644
+index a66eb2a..368a782 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1117,9 +1117,6 @@ if WITH_NETWORK
+@@ -1172,9 +1172,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 ece18a6..9c4722f 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 3133c07..64336aa 100644
+index febc273..3679d84 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -4931,9 +4931,6 @@ install-data-local:
+@@ -5021,9 +5021,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 1da59c0..00b5274 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 ae17c60..f612711 100644
+index 67d0f4b..7facaec 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 d257f29..e566cdc 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 7052bf1..d68bfff 100644
+index cb0d8e1..9ef2ab3 100644
 --- a/src/remote/remote_driver.c
 +++ b/src/remote/remote_driver.c
-@@ -728,7 +728,7 @@ doRemoteOpen (virConnectPtr conn,
+@@ -730,7 +730,7 @@ doRemoteOpen (virConnectPtr conn,
      }
  
      case trans_ssh: {
@@ -20,7 +20,7 @@ index 7052bf1..d68bfff 100644
  
          if (username) nr_args += 2; /* For -l username */
          if (no_tty) nr_args += 5;   /* For -T -o BatchMode=yes -e none */
-@@ -762,6 +762,8 @@ doRemoteOpen (virConnectPtr conn,
+@@ -764,6 +764,8 @@ doRemoteOpen (virConnectPtr conn,
          }
          cmd_argv[j++] = strdup (priv->hostname);
          cmd_argv[j++] = strdup (netcat ? netcat : "nc");
diff --git a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 13605e8..ae0441d 100644
--- a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -41,7 +41,7 @@ to savely detect that the command 'info migrate' is not implemented.
  1 files changed, 9 insertions(+), 1 deletions(-)
 
 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index 569742a..e60c27e 100644
+index 69971a6..ff9641c 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
 @@ -1124,7 +1124,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,

-- 
Libvirt Debian packaging