[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.7.1-2-7-ga62a4a7

Laurent Léonard laurent at open-minds.org
Wed Oct 21 19:13:22 UTC 2009 

The following commit has been merged in the master branch:
commit 12268f6f0d0646009abb1a4db11fad05a2993d0e
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Mon Oct 19 02:59:00 2009 +0200

    Update patches.

diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index 2d36508..135a593 100644
--- a/debian/patches/0001-remove-RHism.diff.patch
+++ b/debian/patches/0001-remove-RHism.diff.patch
@@ -3,20 +3,20 @@ Date: Fri, 7 Mar 2008 09:08:25 +0100
 Subject: [PATCH] remove-RHism.diff
 
 ---
- virsh.1 |    2 +-
+ tools/virsh.pod |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/virsh.1 b/virsh.1
-index 5731b4c..01f9e5b 100644
---- a/virsh.1
-+++ b/virsh.1
-@@ -171,7 +171,7 @@ the program.
- .IX Header "NOTES"
- All \fBvirsh\fR operations rely upon the libvirt library.
+diff --git a/tools/virsh.pod b/tools/virsh.pod
+index 55ec64a..a39d1b5 100644
+--- a/tools/virsh.pod
++++ b/tools/virsh.pod
+@@ -34,7 +34,7 @@ the program.
+ 
+ All B<virsh> operations rely upon the libvirt library.
  For any virsh commands to run xend/qemu, or what ever virtual library that libvirt supports.  For this reason you should start xend/qemu as a service when your system first boots using xen/qemu. This can usually be done using the command
--\&\fBservice libvirtd start\fR .
-+\&\fBinvoke-rc.d libvirt-bin start\fR .
- .PP
- Most \fBvirsh\fR commands require root privileges to run due to the
+-B<service libvirtd start> .
++B<invoke-rc.d libvirt-bin start> .
+ 
+ Most B<virsh> commands require root privileges to run due to the
  communications channels used to talk to the hypervisor.  Running as
 -- 
diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index a005584..400b77d 100644
--- a/debian/patches/0002-qemu-disable-network.diff.patch
+++ b/debian/patches/0002-qemu-disable-network.diff.patch
@@ -3,36 +3,36 @@ Date: Fri, 7 Mar 2008 09:08:26 +0100
 Subject: [PATCH] qemu-disable-network.diff
 
 ---
- qemud/Makefile.am |    3 ---
- qemud/Makefile.in |    3 ---
+ src/Makefile.am |    3 ---
+ src/Makefile.in |    3 ---
  2 files changed, 0 insertions(+), 6 deletions(-)
 
-diff --git a/qemud/Makefile.am b/qemud/Makefile.am
-index 3d143da..e3f42c2 100644
---- a/qemud/Makefile.am
-+++ b/qemud/Makefile.am
-@@ -173,9 +173,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d0ef7d1..5963a73 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -878,9 +878,6 @@ if WITH_NETWORK
  	test -z "$(UUID)" || \
  	  sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
- 	    $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
+ 	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
 -	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
 -           ln -s ../default.xml \
 -	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
- 	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu
- 	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
- 	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
-diff --git a/qemud/Makefile.in b/qemud/Makefile.in
-index ad8b93e..8e33361 100644
---- a/qemud/Makefile.in
-+++ b/qemud/Makefile.in
-@@ -1519,9 +1519,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
- @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu
- @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
- @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
+ endif
+ 
+ uninstall-local::
+diff --git a/src/Makefile.in b/src/Makefile.in
+index f840a67..acbf648 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -3840,9 +3840,6 @@ install-data-local:
+ @WITH_NETWORK_TRUE@	test -z "$(UUID)" || \
+ @WITH_NETWORK_TRUE@	  sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
+ @WITH_NETWORK_TRUE@	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
+- at WITH_NETWORK_TRUE@	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
+- at WITH_NETWORK_TRUE@           ln -s ../default.xml \
+- at WITH_NETWORK_TRUE@	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
+ 
+ uninstall-local::
+ 	rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||:
 -- 
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 2923b1f..3c3a679 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
@@ -3,13 +3,13 @@ Date: Thu, 26 Jun 2008 20:01:38 +0200
 Subject: [PATCH] allow libvirt group to access the socket
 
 ---
- qemud/libvirtd.conf |    8 ++++----
+ daemon/libvirtd.conf |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/qemud/libvirtd.conf b/qemud/libvirtd.conf
+diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
 index 49de466..cc5f056 100644
---- a/qemud/libvirtd.conf
-+++ b/qemud/libvirtd.conf
+--- a/daemon/libvirtd.conf
++++ b/daemon/libvirtd.conf
 @@ -78,7 +78,7 @@
  # without becoming root.
  #
diff --git a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
index 65e7b10..835d676 100644
--- a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
@@ -4,18 +4,18 @@ Subject: [PATCH] fix Debian specific path to hvm loader
 
 Closes: #517059
 ---
- src/xen_internal.c                     |    2 +-
+ src/xen/xen_hypervisor.c               |    2 +-
  tests/xencapsdata/xen-i686-pae-hvm.xml |    2 +-
  tests/xencapsdata/xen-ia64-be-hvm.xml  |    2 +-
  tests/xencapsdata/xen-ia64-hvm.xml     |    2 +-
  tests/xencapsdata/xen-x86_64-hvm.xml   |    4 ++--
  5 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/src/xen_internal.c b/src/xen_internal.c
-index 30fd8bd..c5ba835 100644
---- a/src/xen_internal.c
-+++ b/src/xen_internal.c
-@@ -2211,7 +2211,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
+index 3aa3c30..6f36fdc 100644
+--- a/src/xen/xen_hypervisor.c
++++ b/src/xen/xen_hypervisor.c
+@@ -2218,7 +2218,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
                                                "/usr/lib64/xen/bin/qemu-dm" :
                                                "/usr/lib/xen/bin/qemu-dm"),
                                               (guest_archs[i].hvm ?

-- 
Libvirt Debian packaging

More information about the Pkg-libvirt-commits mailing list