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

[Guido Günther]

The following commit has been merged in the master branch:
commit d27f4a648cf6c7ed18f4636ab9b8e63c6c2c6009
Author: Oliver Seufer <debian at seufer.de>
Date:   Mon Jun 17 14:20:19 2013 +0200

    Rely on xen finding it's tools
    
    Closes: #712563

diff --git a/debian/patches/0001-fix-path-to-hvmloader.patch b/debian/patches/0001-fix-path-to-hvmloader.patch
index fc4a349..a3f926f 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -1,8 +1,8 @@
-From: Guido Guenther <agx at sigxcpu.org>
-Date: Tue, 24 Jun 2008 15:24:21 +0200
+From: Oliver Seufer <debian at seufer.de>
+Date: Sat, 01 Jun 2013 22:41:07 +0200
 Subject: fix path to hvmloader
 
-Closes: #487682
+Closes: #685749
 ---
  virtinst/Installer.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -16,7 +16,7 @@ index 796cc86..61f6387 100644
  
          if not loader and self.is_hvm() and hvxen:
 -            loader = "/usr/lib/xen/boot/hvmloader"
-+            loader = "/usr/lib/xen-default/boot/hvmloader"
++            loader = "hvmloader"
  
          # Use older libvirt 'linux' value for back compat
          if os_type == "xen" and hvxen:
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index f46a770..be46af1 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -1,7 +1,8 @@
-From: Marco Sinhoreli <msinhore at gmail.com>
-Date: Thu, 26 Jun 2008 18:07:13 +0200
+From: Oliver Seufer <debian at seufer.de>
+Date: Sat, 01 Jun 2013 22:41:07 +0200
 Subject: Fix path to pygrub
 
+Closes: #685749
 ---
  virtinst/util.py |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -15,12 +16,12 @@ index d012692..1d2a1f6 100644
              return "/usr/lib/xen/bin/pygrub"
          else:
 -            return "/usr/bin/pygrub"
-+            return "/usr/lib/xen-default/bin/pygrub"
++            return "pygrub"
  
      if platform.system() == "SunOS":
          return "/usr/lib/xen/bin/pygrub"
 -    return "/usr/bin/pygrub"
-+    return "/usr/lib/xen-default/bin/pygrub"
++    return "pygrub"
  
  def uri_split(uri):
      """

-- 
Virtinst Debian packaging