[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.6-2-9-ge975aa5

[Guido Günther]

The following commit has been merged in the experimental branch:
commit fb8aed9561697c2d1aa9979fccd15c9c59771e2a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Nov 1 19:02:10 2011 +0100

    Update remaining patches

diff --git a/debian/patches/Disable-failing-virnetsockettest.patch b/debian/patches/Disable-failing-virnetsockettest.patch
index 0151a7d..dbb2f99 100644
--- a/debian/patches/Disable-failing-virnetsockettest.patch
+++ b/debian/patches/Disable-failing-virnetsockettest.patch
@@ -8,7 +8,7 @@ until we debugged the interaction with pbuilder
  1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index b3a2705..f6da0b8 100644
+index 6320ce0..1b88605 100644
 --- a/tests/virnetsockettest.c
 +++ b/tests/virnetsockettest.c
 @@ -488,10 +488,12 @@ mymain(void)
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index d86b861..12305ae 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,10 +42,10 @@ 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 cedf582..a32cb66 100644
+index 5de4d24..fdfb32f 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
-@@ -1491,7 +1491,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1599,7 +1599,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
              }
              *total += disk_total * 1024;
          }
diff --git a/debian/patches/qemu-disable-network.diff.patch b/debian/patches/qemu-disable-network.diff.patch
index cce16ad..15fdffa 100644
--- a/debian/patches/qemu-disable-network.diff.patch
+++ b/debian/patches/qemu-disable-network.diff.patch
@@ -8,10 +8,10 @@ Subject: qemu-disable-network.diff
  2 files changed, 0 insertions(+), 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 738ee91..b1c25a2 100644
+index 5cbe1ac..6c91942 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1501,9 +1501,6 @@ if WITH_NETWORK
+@@ -1559,9 +1559,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
@@ -22,10 +22,10 @@ index 738ee91..b1c25a2 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index b421da7..2a8066e 100644
+index aebabb6..92f9329 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -6585,9 +6585,6 @@ install-data-local:
+@@ -6713,9 +6713,6 @@ install-data-local:
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
diff --git a/debian/patches/remove-RHism.diff.patch b/debian/patches/remove-RHism.diff.patch
index 50a6c33..955f2a7 100644
--- a/debian/patches/remove-RHism.diff.patch
+++ b/debian/patches/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 88dee26..8a2fa3f 100644
+index 775d302..d6fbf26 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -98,7 +98,7 @@ Output elapsed time information for each command.
diff --git a/debian/patches/series b/debian/patches/series
index 47b92bf..a2747d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,11 @@
 remove-RHism.diff.patch
 qemu-disable-network.diff.patch
 allow-libvirt-group-to-access-the-socket.patch
-fix-Debian-specific-path-to-hvm-loader.patch
+debian/fix-Debian-specific-path-to-hvm-loader.patch
 patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
-Debianize-libvirt-guests.patch
+debian/Debianize-libvirt-guests.patch
 virsh-Initialize-library-before-calling-virResetLast.patch
 Disable-daemon-start-test.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
 Disable-failing-virnetsockettest.patch
 debian/Don-t-require-gawk-for-a-simple-print-expression.patch
diff --git a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
index 8cea61b..57c601b 100644
--- a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
+++ b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
@@ -26,10 +26,10 @@ Otherwise this results in crashes like:
  1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/tools/virsh.c b/tools/virsh.c
-index e5ea9d7..5bf4551 100644
+index 5544a41..8784a6f 100644
 --- a/tools/virsh.c
 +++ b/tools/virsh.c
-@@ -15501,6 +15501,9 @@ vshInit(vshControl *ctl)
+@@ -15996,6 +15996,9 @@ vshInit(vshControl *ctl)
      /* set up the signals handlers to catch disconnections */
      vshSetupSignals();
  

-- 
Libvirt Debian packaging