Rediff remaining patches

diff --git a/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
index b0f3359..01993be 100644 (file)
--- a/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/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 21e6645..6dafa63 100644
+index 6a46a39..4bc7154 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
 @@ -2339,7 +2339,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,

diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 8421b35..6377e17 100644 (file)
--- 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 3b42e7a..909d3e7 100644
+index aa5d1c6..a2b0614 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
-@@ -1222,7 +1222,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1237,7 +1237,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
              *total *= 1024;
  
          }

diff --git a/debian/patches/qemu-disable-network.diff.patch b/debian/patches/qemu-disable-network.diff.patch
index 52d087c..50fa766 100644 (file)
--- a/debian/patches/qemu-disable-network.diff.patch
+++ b/debian/patches/qemu-disable-network.diff.patch
@@ -8,29 +8,29 @@ Subject: qemu-disable-network.diff
  2 files changed, 0 insertions(+), 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 3612a24..273b407 100644
+index cd8a7e9..0927833 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1305,9 +1305,6 @@ if WITH_NETWORK
+@@ -1406,9 +1406,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; }
 -      test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
--           ln -s ../default.xml \
+-         ln -s ../default.xml \
 -          $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
  endif
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 2f4724b..b8cfe78 100644
+index e688234..e29370f 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -5969,9 +5969,6 @@ install-data-local:
+@@ -6266,9 +6266,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; }
 -@WITH_NETWORK_TRUE@   test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
--@WITH_NETWORK_TRUE@           ln -s ../default.xml \
+-@WITH_NETWORK_TRUE@      ln -s ../default.xml \
 -@WITH_NETWORK_TRUE@       $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
  
  uninstall-local::

diff --git a/debian/patches/remove-RHism.diff.patch b/debian/patches/remove-RHism.diff.patch
index c15f499..bfe7ff1 100644 (file)
--- 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 7ed3003..73dd148 100644
+index 736b919..a89bba6 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -97,7 +97,7 @@ Output elapsed time information for each command.

diff --git a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
index f92856f..b347f5a 100644 (file)
--- a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
+++ b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
@@ -25,10 +25,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 d98be1c..29fd80e 100644
+index 9a189fd..3a42a4b 100644
 --- a/tools/virsh.c
 +++ b/tools/virsh.c
-@@ -12759,6 +12759,9 @@ vshInit(vshControl *ctl)
+@@ -13374,6 +13374,9 @@ vshInit(vshControl *ctl)
      /* set up the signals handlers to catch disconnections */
      vshSetupSignals();