-
Committer:
Bazaar Package Importer
-
Author(s):
Marc Deslauriers
-
Date:
2011-05-18 13:43:29 UTC
-
mfrom:
(1.6.3 sid)
-
Revision ID:
james.westby@ubuntu.com-20110518134329-waxo0mmm3gkp9u7k
Tags: 0.500.6-1ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/patches/9002_Lucid.patch: use 10.04, not 10.4 as version for
Ubuntu 10.04 LTS "Lucid Lynx"
- debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
testsuite for 0001-fix-path-to-hvmloader.patch and
0002-Fix-path-to-pygrub.patch.
- debian/patches/9004_ubuntu_correct_tree.patch: Correctly detect an
UbuntuDistro from an HTTP source.
- debian/control: added acl package to depends.
- debian/control: demote virt-viewer to Suggests, as it's in universe.
- debian/control: remove qemu transition package from Recommends and
add qemu-kvm to Suggests for the qemu-img binary as it's not required
to simply manage a remote server with virt-manager.
- Recommends libvirt-bin
* Removed patches:
- debian/patches/9001_Ubuntu.patch: upstream