[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.6.5-3

[Guido Günther]

The following commit has been merged in the master branch:
commit ae209981e063c2f988384c07d89ccf1bc17db78f
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Jul 29 12:15:38 2009 +0200

    fix Debian Xen path patch to also cover the testsuite

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 18ea31b..2769114 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,8 +4,12 @@ Subject: [PATCH] fix Debian specific path to hvm loader
 
 Closes: #517059
 ---
- src/xen_internal.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/xen_internal.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 cc5a8f9..63b8785 100644
@@ -20,4 +24,65 @@ index cc5a8f9..63b8785 100644
                                                NULL),
                                               1,
                                               machines)) == NULL)
+diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
+index 42b099c..2886c09 100644
+--- a/tests/xencapsdata/xen-i686-pae-hvm.xml
++++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
+@@ -34,7 +34,7 @@
+     <arch name='i686'>
+       <wordsize>32</wordsize>
+       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
++      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+       <machine>xenfv</machine>
+       <domain type='xen'>
+       </domain>
+diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
+index 732b693..cf3dfc1 100644
+--- a/tests/xencapsdata/xen-ia64-be-hvm.xml
++++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
+@@ -31,7 +31,7 @@
+     <arch name='ia64'>
+       <wordsize>64</wordsize>
+       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
++      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+       <machine>xenfv</machine>
+       <domain type='xen'>
+       </domain>
+diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
+index ef48a95..871cd65 100644
+--- a/tests/xencapsdata/xen-ia64-hvm.xml
++++ b/tests/xencapsdata/xen-ia64-hvm.xml
+@@ -28,7 +28,7 @@
+     <arch name='ia64'>
+       <wordsize>64</wordsize>
+       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
++      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+       <machine>xenfv</machine>
+       <domain type='xen'>
+       </domain>
+diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
+index 52c12c6..83dac3e 100644
+--- a/tests/xencapsdata/xen-x86_64-hvm.xml
++++ b/tests/xencapsdata/xen-x86_64-hvm.xml
+@@ -31,7 +31,7 @@
+     <arch name='i686'>
+       <wordsize>32</wordsize>
+       <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
++      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+       <machine>xenfv</machine>
+       <domain type='xen'>
+       </domain>
+@@ -49,7 +49,7 @@
+     <arch name='x86_64'>
+       <wordsize>64</wordsize>
+       <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
++      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+       <machine>xenfv</machine>
+       <domain type='xen'>
+       </domain>
 -- 

-- 
Libvirt Debian packaging