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

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 91cd1701b4f172015ffcb20ca67b61283525b076
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Nov 3 18:58:43 2011 +0100

    Rediff remaining patches
    
    Git-Dch: Ignore

diff --git a/debian/patches/Disable-failing-virnetsockettest.patch b/debian/patches/Disable-failing-virnetsockettest.patch
index dbb2f99..8c9cd46 100644
--- a/debian/patches/Disable-failing-virnetsockettest.patch
+++ b/debian/patches/Disable-failing-virnetsockettest.patch
@@ -8,10 +8,10 @@ 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 6320ce0..1b88605 100644
+index a76e5cc..b271ec4 100644
 --- a/tests/virnetsockettest.c
 +++ b/tests/virnetsockettest.c
-@@ -488,10 +488,12 @@ mymain(void)
+@@ -496,10 +496,12 @@ mymain(void)
      if (virtTestRun("Socket UNIX Addrs", 1, testSocketUNIXAddrs, NULL) < 0)
          ret = -1;
  
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index c2aa3c7..948fe6e 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -4,6 +4,7 @@ Subject: Debianize libvirt-guests
 
 Origin: vendor
 
+
 ---
  tools/libvirt-guests.init.sh |   43 +++++++++++++----------------------------
  tools/libvirt-guests.sysconf |    6 ++--
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 7465704..ffca4c6 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 5cbe1ac..6c91942 100644
+index bf26b19..10c9eab 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1559,9 +1559,6 @@ if WITH_NETWORK
+@@ -1564,9 +1564,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 5cbe1ac..6c91942 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index aebabb6..92f9329 100644
+index cdd5e4b..ee88275 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -6713,9 +6713,6 @@ install-data-local:
+@@ -6719,9 +6719,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 0dfee44..2556378 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,6 +5,7 @@ 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/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
index 9e57e2f..5ac45c2 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 58ae6a3..9905501 100644
+index 634b23b..0d4adcd 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
-@@ -2330,7 +2330,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2329,7 +2329,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
                                                "/usr/lib64/xen/bin/qemu-dm" :
                                                "/usr/lib/xen/bin/qemu-dm"),
                                               (guest_archs[i].hvm ?

-- 
Libvirt Debian packaging