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

Guido Günther agx at sigxcpu.org
Tue Jan 10 14:58:09 UTC 2012 

The following commit has been merged in the experimental branch:
commit 623022f839433a7a3178158abe3ebffe1b78f672
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jan 10 12:30:56 2012 +0100

    Rebase patches

diff --git a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
index c575ad3..0145a34 100644
--- a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
@@ -8,7 +8,7 @@ Subject: Allow libvirt group to access the socket
  2 files changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index f218454..bb3efd1 100644
+index 3eab2be..eb183f0 100644
 --- a/daemon/libvirtd.conf
 +++ b/daemon/libvirtd.conf
 @@ -78,7 +78,7 @@
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 513493f..3b66576 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -4,8 +4,6 @@ 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 003c81d..79511cb 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,18 +4,16 @@ 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 4c98397..f79b739 100644
+index 0a1221a..6b752f1 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1586,9 +1586,6 @@ if WITH_NETWORK
+@@ -1588,9 +1588,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 +24,10 @@ index 4c98397..f79b739 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index e74ebec..4cee374 100644
+index e52b356..171f557 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -7013,9 +7013,6 @@ install-data-local:
+@@ -7022,9 +7022,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 a1b73cd..7669d92 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,19 +5,17 @@ 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 a62833e..3ec4f6c 100644
+index 9c244be..25b519e 100644
 --- a/src/nwfilter/nwfilter_ebiptables_driver.c
 +++ b/src/nwfilter/nwfilter_ebiptables_driver.c
-@@ -4025,7 +4025,7 @@ ebiptablesDriverInit(bool privileged)
-     if (virMutexInit(&execCLIMutex))
-         return EINVAL;
+@@ -4040,7 +4040,7 @@ ebiptablesDriverInit(bool privileged)
+     if (virMutexInit(&execCLIMutex) < 0)
+         return -EINVAL;
  
 -    gawk_cmd_path = virFindFileInPath("gawk");
 +    gawk_cmd_path = virFindFileInPath("awk");
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 215e50e..e24eaf7 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,8 +4,6 @@ Subject: fix Debian specific path to hvm loader
 
 Closes: #517059
 
-
-
 ---
  src/xen/xen_hypervisor.c               |    2 +-
  tests/xencapsdata/xen-i686-pae-hvm.xml |    2 +-
@@ -15,10 +13,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 6c71b65..9c924c2 100644
+index ee3a59c..5357ac1 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
-@@ -2338,7 +2338,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2397,7 +2397,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 ba28e60..342304a 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,10 +7,10 @@ Subject: remove-RHism.diff
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 5131ade..35f6a82 100644
+index 138f886..5623dd2 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
-@@ -98,7 +98,7 @@ Output elapsed time information for each command.
+@@ -103,7 +103,7 @@ telnet's B<^]> is used.
  
  Most B<virsh> operations rely upon the libvirt library being able to
  connect to an already running libvirtd service.  This can usually be
diff --git a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
index f2cf2f6..fcad6c6 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 76deaa9..a8263d6 100644
+index e4b812e..30800d8 100644
 --- a/tools/virsh.c
 +++ b/tools/virsh.c
-@@ -17098,6 +17098,9 @@ vshInit(vshControl *ctl)
+@@ -17787,6 +17787,9 @@ vshInit(vshControl *ctl)
      /* set up the signals handlers to catch disconnections */
      vshSetupSignals();
  

-- 
Libvirt Debian packaging

More information about the Pkg-libvirt-commits mailing list