[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, experimental, updated. debian/0.5.1-5-7-gd6e79a0

[Guido Günther]

The following commit has been merged in the experimental branch:
commit d80a176d5b7d29ac61a7b3a5af2f143bbed6dc8e
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Feb 5 15:26:21 2009 +0100

    adjust remaining patches to new upstream version

diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index 3861615..7584793 100644
--- a/debian/patches/0002-qemu-disable-network.diff.patch
+++ b/debian/patches/0002-qemu-disable-network.diff.patch
@@ -8,13 +8,13 @@ Subject: [PATCH] qemu-disable-network.diff
  2 files changed, 0 insertions(+), 6 deletions(-)
 
 diff --git a/qemud/Makefile.am b/qemud/Makefile.am
-index 15d3717..d6b4ceb 100644
+index a0c161a..0e736d0 100644
 --- a/qemud/Makefile.am
 +++ b/qemud/Makefile.am
-@@ -138,9 +138,6 @@ install-data-local: install-init install-data-sasl install-data-polkit
- 	  $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
- 	sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
- 	  $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
+@@ -152,9 +152,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
+ 	test -z "$(UUID)" || \
+ 	  sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
+ 	    $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
 -	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
 -           ln -s ../default.xml \
 -	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
@@ -22,13 +22,13 @@ index 15d3717..d6b4ceb 100644
  	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
  	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
 diff --git a/qemud/Makefile.in b/qemud/Makefile.in
-index 7735a0a..561163c 100644
+index ac4bfdc..5a22dc9 100644
 --- a/qemud/Makefile.in
 +++ b/qemud/Makefile.in
-@@ -1195,9 +1195,6 @@ remote_protocol.c: remote_protocol.h
- @WITH_LIBVIRTD_TRUE@	  $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
- @WITH_LIBVIRTD_TRUE@	sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
- @WITH_LIBVIRTD_TRUE@	  $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
+@@ -1291,9 +1291,6 @@ remote_protocol.c: remote_protocol.h
+ @WITH_LIBVIRTD_TRUE@	test -z "$(UUID)" || \
+ @WITH_LIBVIRTD_TRUE@	  sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
+ @WITH_LIBVIRTD_TRUE@	    $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
 - at WITH_LIBVIRTD_TRUE@	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
 - at WITH_LIBVIRTD_TRUE@           ln -s ../default.xml \
 - at WITH_LIBVIRTD_TRUE@	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
diff --git a/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch b/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
index f17db0b..f783f09 100644
--- a/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] allow libvirt group to access the socket
  1 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/qemud/libvirtd.conf b/qemud/libvirtd.conf
-index a12a897..804fe07 100644
+index 4932084..2e9b3f6 100644
 --- a/qemud/libvirtd.conf
 +++ b/qemud/libvirtd.conf
 @@ -78,7 +78,7 @@

-- 
Libvirt debian packaging