diff -u testdrive-1.38/debian/control testdrive-1.38/debian/control --- testdrive-1.38/debian/control +++ testdrive-1.38/debian/control @@ -12,7 +12,7 @@ Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, python, - qemu-kvm | kvm ( >= 1:84+dfsg-0ubuntu12.4 ) | virtualbox-ose ( >= 3.0.8) | virtualbox-3.0 | virtualbox-3.1, + qemu-kvm | kvm ( >= 1:84+dfsg-0ubuntu12.4 ) | virtualbox-ose ( >= 3.0.8) | virtualbox-3.0 | virtualbox-3.1 | virtualbox-3.2, rsync, wget, python-launchpadlib diff -u testdrive-1.38/debian/changelog testdrive-1.38/debian/changelog --- testdrive-1.38/debian/changelog +++ testdrive-1.38/debian/changelog @@ -1,3 +1,11 @@ +testdrive (1.38-0ubuntu1.1) lucid-proposed; urgency=low + + * Add support for Virtualbox 3.2 (LP: #589419) + - debian/control: add virtualbox-3.2 as optional binary depends + - testdrive: add changes from testdrive trunk r245 for Virtualbox 3.2 + + -- Micah Gersten Tue, 22 Jun 2010 00:29:32 -0500 + testdrive (1.38-0ubuntu1) lucid; urgency=low * testdrive: support usb-creator-kde, LP: #570509 only in patch2: unchanged: --- testdrive-1.38.orig/testdrive +++ testdrive-1.38/testdrive @@ -397,10 +397,10 @@ # version string for comparison later vboxversion = commands.getoutput("VBoxManage --version") vboxversion = "%s.%s" % (vboxversion.split(".")[0], vboxversion.split(".")[1]) - if vboxversion == "3.0" or vboxversion == "3.1": + if vboxversion == "3.0" or vboxversion == "3.1" or vboxversion == "3.2": info("VirtualBox %s detected." % vboxversion) else: - error("Unsupported version (%s) of VirtualBox; please install v3.0 or v3.1." % vboxversion) + error("Unsupported version (%s) of VirtualBox; please install v3.0 or v3.1 or v3.2." % vboxversion) DISK_SIZE = DISK_SIZE.replace("G", "000") if os.path.exists(DISK_FILE): @@ -410,7 +410,7 @@ run_or_die("VBoxManage createhd --filename %s --size %s" % (DISK_FILE, DISK_SIZE)) if vboxversion == "3.0": run("VBoxManage modifyvm %s --hda none" % VBOX_NAME) - elif vboxversion == "3.1": + elif vboxversion == "3.1" or vboxversion == "3.2": run("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 0 --type hdd --medium none" % VBOX_NAME) run("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 1 --type dvddrive --medium none" % VBOX_NAME) info("Creating the Virtual Machine...") @@ -435,7 +435,7 @@ run_or_die("VBoxManage startvm %s" % VBOX_NAME) print(">>> %s <<<\n" % (PATH_TO_ISO)) run_or_die("VBoxManage controlvm %s dvdattach %s" % (VBOX_NAME, PATH_TO_ISO)) - elif vboxversion == "3.1": + elif vboxversion == "3.1" or vboxversion == "3.2": run_or_die("VBoxManage storagectl %s --name \"IDE Controller\" --add ide" % VBOX_NAME) run_or_die("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 0 --type hdd --medium %s" % (VBOX_NAME, DISK_FILE)) run_or_die("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 1 --type dvddrive --medium %s" % (VBOX_NAME, PATH_TO_ISO))