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

[Guido Günther]

The following commit has been merged in the experimental branch:
commit bd1c1e0c006680212f8b0ab3aa35143060430569
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Jun 29 11:23:24 2012 +0200

    Rebase patches

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 b410178..84104dc 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
@@ -12,10 +12,10 @@ to not interfere with existing network configurations
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index e40909b..022a4ce 100644
+index 2309984..a197759 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1638,9 +1638,6 @@ if WITH_NETWORK
+@@ -1639,9 +1639,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; }
@@ -26,10 +26,10 @@ index e40909b..022a4ce 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index f0d673b..7eb9e65 100644
+index 9f48cf6..1f21b0b 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -7684,9 +7684,6 @@ install-data-local:
+@@ -7694,9 +7694,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/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index e3d1182..42b22b3 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 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index f83a29d..bd495b4 100644
+index 93fdac7..1aa4015 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -104,7 +104,7 @@ alphabetic character, @, [, ], \, ^, _.
diff --git a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
index f5d54bf..2d74024 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 file changed, 3 insertions(+)
 
 diff --git a/tools/virsh.c b/tools/virsh.c
-index 567a5f6..ce8b9bf 100644
+index a783f47..7221bf3 100644
 --- a/tools/virsh.c
 +++ b/tools/virsh.c
-@@ -20097,6 +20097,9 @@ vshInit(vshControl *ctl)
+@@ -20289,6 +20289,9 @@ vshInit(vshControl *ctl)
      /* set up the signals handlers to catch disconnections */
      vshSetupSignals();
  

-- 
Libvirt Debian packaging