← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to virtinst/__init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Louis Dupond
  • Date: 2010-05-05 03:32:42 UTC
  • mfrom: (1.3.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100505033242-um6f6pjcc89i07m0
Tags: 0.500.3-1ubuntu1
https://launchpad.net/bugs/590068
https://launchpad.net/bugs/524318
https://launchpad.net/bugs/533048
https://launchpad.net/bugs/215084
* Merge from debian unstable. (LP: #590068)  Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Added lucid and maverick to OS list and enable virtio for it.
  - debian/patches/0003-Fix-patch-to-keyboard-configuration.patch: disable
    as the keyboard config in Ubuntu is still in /etc/default/console-setup
    and this was causing virt-manager to always default to a en-us
    keyboard. (LP: #524318)
  - debian/control: added acl package to depends. (LP: #533048)
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin (LP: #215084)
* debian/patches/9002-add-ca-keymap.patch: dropped, its now in upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
virtinst/__init__.py
28
28
__version_info__ = tuple([ int(num) for num in __version__.split('.')])
29
29
 
30
30
import Storage
 
31
import Interface
31
32
from Guest import Guest, XenGuest
32
33
from VirtualDevice import VirtualDevice
33
34
from VirtualNetworkInterface import VirtualNetworkInterface, \
40
41
                               VirtualHostDevicePCI)
41
42
from VirtualCharDevice import VirtualCharDevice
42
43
from VirtualVideoDevice import VirtualVideoDevice
 
44
from VirtualController import VirtualController
 
45
from VirtualWatchdog import VirtualWatchdog
43
46
from FullVirtGuest import FullVirtGuest
44
47
from ParaVirtGuest import ParaVirtGuest
45
48
from DistroInstaller import DistroInstaller
46
49
from PXEInstaller import PXEInstaller
47
50
from LiveCDInstaller import LiveCDInstaller
48
51
from ImportInstaller import ImportInstaller
49
 
from ImageManager import ImageInstaller
 
52
from ImageInstaller import ImageInstaller
50
53
from CloneManager import CloneDesign
51
54
from User import User
 
55
from Clock import Clock
 
56
from Seclabel import Seclabel
52
57
import util
53
58
import support
54
59
 
58
63
           "XenNetworkInterface", "VirtualGraphics", "VirtualAudio",
59
64
           "VirtualDisk", "XenDisk", "FullVirtGuest", "ParaVirtGuest",
60
65
           "DistroInstaller", "PXEInstaller", "LiveCDInstaller",
61
 
           "ImportInstaller", "ImageInstaller", "CloneDesign", "Storage",
62
 
           "User", "util", "support", "VirtualDevice",
 
66
           "ImportInstaller", "ImageInstaller", "CloneDesign",
 
67
           "Storage", "Interface",
 
68
           "User", "util", "support", "VirtualDevice", "Clock", "Seclabel",
63
69
           "VirtualHostDevice", "VirtualHostDeviceUSB", "VirtualVideoDevice",
64
 
           "VirtualHostDevicePCI", "VirtualCharDevice", "VirtualInputDevice"]
 
70
           "VirtualHostDevicePCI", "VirtualCharDevice", "VirtualInputDevice",
 
71
           "VirtualController", "VirtualWatchdog"]