[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.11_rc1-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 177c0ff61b67b681e8a03ecb2ce5a589748ea4fa
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Mar 26 21:04:32 2012 +0200

    Update patches
    
    Git-Dch: Ignore

diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index 79511cb..5be54f0 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -4,16 +4,17 @@ Subject: Don't enable default network on boot
 
 to not interfere with existing network configurations
 
+
 ---
  src/Makefile.am |    3 ---
  src/Makefile.in |    3 ---
  2 files changed, 0 insertions(+), 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 0a1221a..6b752f1 100644
+index a2aae9d..6860e21 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1588,9 +1588,6 @@ if WITH_NETWORK
+@@ -1622,9 +1622,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; }
@@ -24,10 +25,10 @@ index 0a1221a..6b752f1 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index e52b356..171f557 100644
+index 26b9dce..34c96a8 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -7022,9 +7022,6 @@ install-data-local:
+@@ -7423,9 +7423,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/debian/Don-t-require-gawk-for-a-simple-print-expression.patch b/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
index 7669d92..bc748bf 100644
--- a/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
+++ b/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
@@ -5,15 +5,16 @@ Subject: Don't require gawk for a simple print expression
 Closes: #636712
 Thanks: Luca Capello
 
+
 ---
  src/nwfilter/nwfilter_ebiptables_driver.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
-index 9c244be..25b519e 100644
+index 0db9f19..09538a2 100644
 --- a/src/nwfilter/nwfilter_ebiptables_driver.c
 +++ b/src/nwfilter/nwfilter_ebiptables_driver.c
-@@ -4040,7 +4040,7 @@ ebiptablesDriverInit(bool privileged)
+@@ -4044,7 +4044,7 @@ ebiptablesDriverInit(bool privileged)
      if (virMutexInit(&execCLIMutex) < 0)
          return -EINVAL;
  
diff --git a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
index e24eaf7..dd7c889 100644
--- a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
@@ -4,6 +4,7 @@ Subject: fix Debian specific path to hvm loader
 
 Closes: #517059
 
+
 ---
  src/xen/xen_hypervisor.c               |    2 +-
  tests/xencapsdata/xen-i686-pae-hvm.xml |    2 +-
@@ -13,10 +14,10 @@ Closes: #517059
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index ee3a59c..5357ac1 100644
+index 4401b68..4817b95 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
-@@ -2397,7 +2397,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2359,7 +2359,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
                                                "/usr/lib64/xen/bin/qemu-dm" :
                                                "/usr/lib/xen/bin/qemu-dm"),
                                               (guest_archs[i].hvm ?
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 342304a..aaa2519 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/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 138f886..5623dd2 100644
+index c7d5bbd..747832a 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -103,7 +103,7 @@ telnet's B<^]> is used.
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index a1fbc65..7bbce93 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 2c68be8..9bcd066 100644
+index 30a0416..631899b 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
-@@ -1632,7 +1632,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1654,7 +1654,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
              }
              *total += disk_total * 1024;
          }
diff --git a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
index fcad6c6..9e2477e 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 e4b812e..30800d8 100644
+index ee6db4c..b3dc21c 100644
 --- a/tools/virsh.c
 +++ b/tools/virsh.c
-@@ -17787,6 +17787,9 @@ vshInit(vshControl *ctl)
+@@ -19276,6 +19276,9 @@ vshInit(vshControl *ctl)
      /* set up the signals handlers to catch disconnections */
      vshSetupSignals();
  

-- 
Libvirt Debian packaging