diff -Nru virtinst-0.600.1/debian/changelog virtinst-0.600.1/debian/changelog --- virtinst-0.600.1/debian/changelog 2012-02-11 16:54:45.000000000 +0000 +++ virtinst-0.600.1/debian/changelog 2012-02-24 20:53:14.000000000 +0000 @@ -1,3 +1,10 @@ +virtinst (0.600.1-1ubuntu2) precise; urgency=low + + * debian/patches/0004-Fix-path-to-qemu-dm.patch: fix the path to the + qemu-dm binary. (LP: #936048) + + -- Marc Deslauriers Fri, 24 Feb 2012 15:51:30 -0500 + virtinst (0.600.1-1ubuntu1) precise; urgency=low * Merge from debian unstable. Remaining changes: diff -Nru virtinst-0.600.1/debian/patches/0004-Fix-path-to-qemu-dm.patch virtinst-0.600.1/debian/patches/0004-Fix-path-to-qemu-dm.patch --- virtinst-0.600.1/debian/patches/0004-Fix-path-to-qemu-dm.patch 1970-01-01 00:00:00.000000000 +0000 +++ virtinst-0.600.1/debian/patches/0004-Fix-path-to-qemu-dm.patch 2012-02-24 20:52:46.000000000 +0000 @@ -0,0 +1,20 @@ +Description: fix path to the qemu-dm binary +Author: Marc Deslauriers +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/virtinst/+bug/936048 + +Index: virtinst-0.600.1/virtinst/Guest.py +=================================================================== +--- virtinst-0.600.1.orig/virtinst/Guest.py 2012-01-24 19:00:05.000000000 -0500 ++++ virtinst-0.600.1/virtinst/Guest.py 2012-02-24 15:50:59.958518345 -0500 +@@ -886,10 +886,7 @@ + if (not self.emulator and + self.installer.is_hvm() and + self.type == "xen"): +- if self._get_caps().host.arch in ("x86_64"): +- emulator = "/usr/lib64/xen/bin/qemu-dm" +- else: +- emulator = "/usr/lib/xen/bin/qemu-dm" ++ emulator = "/usr/lib/xen-default/bin/qemu-dm" + + emu_xml = "" + if emulator is not None: diff -Nru virtinst-0.600.1/debian/patches/series virtinst-0.600.1/debian/patches/series --- virtinst-0.600.1/debian/patches/series 2012-02-11 16:42:58.000000000 +0000 +++ virtinst-0.600.1/debian/patches/series 2012-02-24 20:49:15.000000000 +0000 @@ -4,3 +4,4 @@ 9003-fix-path-to-hvmloader-in-testsuite.patch 9004_ubuntu_fix_tree_support.patch 9005_ubuntu_precise.patch +0004-Fix-path-to-qemu-dm.patch