[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.500.1-2-4-gdda09ec

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 9e17e30afb2c62a5ab6f733b410bfa709bc3d366
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Tue Feb 9 23:41:36 2010 +0100

    Redo patches.

diff --git a/debian/patches/0001-fix-path-to-hvmloader.patch b/debian/patches/0001-fix-path-to-hvmloader.patch
index 5a5638b..4b393fb 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -8,7 +8,7 @@ Closes: #487682
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
-index 4ae6148..4cfe40e 100644
+index c49a9f0..ccefb4a 100644
 --- a/virtinst/FullVirtGuest.py
 +++ b/virtinst/FullVirtGuest.py
 @@ -66,7 +66,7 @@ class FullVirtGuest(Guest):
@@ -18,6 +18,6 @@ index 4ae6148..4cfe40e 100644
 -            self.loader = "/usr/lib/xen/boot/hvmloader"
 +            self.loader = "/usr/lib/xen-default/boot/hvmloader"
  
- 
-     def os_features(self):
+         # Add a default console device
+         dev = VirtualCharDevice.get_dev_instance(self.conn,
 -- 
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index 365fc57..41897f1 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix path to pygrub
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/virtinst/util.py b/virtinst/util.py
-index 0425334..f31dde9 100644
+index 92dacfe..dcb4ee8 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
 @@ -402,11 +402,11 @@ def pygrub_path(conn=None):
diff --git a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
index 638f0fc..decfea2 100644
--- a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
+++ b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
@@ -8,7 +8,7 @@ Since console-setup 1.47 the keyboard configuration is in a new package keyboard
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/util.py b/virtinst/util.py
-index f31dde9..6207754 100644
+index dcb4ee8..773c5d5 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
 @@ -45,7 +45,7 @@ import support

-- 
Virtinst Debian packaging