--- testdrive-2.0.orig/debian/copyright +++ testdrive-2.0/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Dustin Kirkland +Thu, 5 Nov 200r98 15:39:37 -0600 + +It was downloaded from: http://launchpad.net/testdrive + +Upstream Authors: + Dustin Kirkland + Dustin Kirkland + +Copyright: + Copyright (C) 2009 Canonical Ltd. + Copyright (C) 2009 Dustin Kirkland + + All rights reserved. + +License: + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + On Debian systems, the complete text of the GNU General Public + License, version 3, can be found in /usr/share/common-licenses/GPL-3. + +The Ubuntu packaging: + Copyright (C) 2009 Canonical Ltd. + Copyright (C) 2009 Dustin Kirkland + released under the GPL-3. --- testdrive-2.0.orig/debian/rules +++ testdrive-2.0/debian/rules @@ -0,0 +1,49 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +PKG=testdrive +VER=`head -n 1 debian/changelog | sed 's/^.*(//' | sed 's/).*//' | sed 's/-.*//'` + +release-upstream: + dh_testdir + bzr export ../${PKG}_${VER}.orig.tar.gz + +prebuild: + +build: + intltool-merge -d po testdrive.desktop.in testdrive.desktop + +clean: + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_install -X.bzr + +# Everything else is handled by dh_install + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -X.bzr -i + dh_installman -i doc/testdrive.1 + dh_installchangelogs -i + dh_installdebconf -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + DH_PYCENTRAL="include-links" dh_pycentral -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary: binary-indep +.PHONY: build clean binary-indep binary install prebuild get-orig-source + +binary-arch: --- testdrive-2.0.orig/debian/testdrive-common.install +++ testdrive-2.0/debian/testdrive-common.install @@ -0,0 +1 @@ +testdrive.py usr/share/pyshared --- testdrive-2.0.orig/debian/control +++ testdrive-2.0/debian/control @@ -0,0 +1,48 @@ +Source: testdrive +Section: misc +Priority: optional +Maintainer: Dustin Kirkland +Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 6), gettext-base, intltool +Build-Depends-Indep: python, python-central (>= 0.5) +XS-Python-Version: >=2.6 +Homepage: http://launchpad.net/testdrive +Vcs-Bzr: http://bazaar.launchpad.net/~kirkland/testdrive/trunk + +Package: testdrive +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, + ${python:Depends}, + debconf (>= 0.5) | debconf-2.0, + testdrive-common, + qemu-kvm | kvm ( >= 1:84+dfsg-0ubuntu12.4 ) | virtualbox-ose ( >= 3.0.8) | virtualbox-3.0 | virtualbox-3.1, + rsync, + wget +Recommends: zsync, usb-creator-gtk | usb-creator-kde, cpu-checker, kvm-pxe +Description: run the daily Ubuntu ISO in a virtual machine + Testdrive helps you download and run the daily Ubuntu development ISO + in a virtual machine on your local hardware. + . + It is strongly recommended that you have a CPU with VT and sufficient + memory on your system to host virtual machines. In this case, testdrive + will use KVM to host your virtual machines. + . + Alternatively, you can use VirtualBox. + +Package: testdrive-common +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${python:Depends}, ${misc:Depends}, python-launchpadlib +Description: run the daily Ubuntu ISO in a virtual machine (common files) + Testdrive helps you download and run the daily Ubuntu development ISO + in a virtual machine on your local hardware. + . + It is strongly recommended that you have a CPU with VT and sufficient + memory on your system to host virtual machines. In this case, testdrive + will use KVM to host your virtual machines. + . + Alternatively, you can use VirtualBox. + . + This package contains the common files used by the different Testdrive + front-ends. --- testdrive-2.0.orig/debian/testdrive.postinst +++ testdrive-2.0/debian/testdrive.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# Unconditionally overwrite config file, if upgrading from before 2.0 (syntax changed) +if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.0; then + cat /usr/share/testdrive/testdriverc > /etc/testdriverc +fi + +#DEBHELPER# + +exit 0 --- testdrive-2.0.orig/debian/testdrive.preinst +++ testdrive-2.0/debian/testdrive.preinst @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +# Backup old confile +if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.0; then + if [ -f /etc/testdriverc ]; then + if md5sum /etc/testdriverc | grep -qs e76ef0100e1314c1094e8677755c63df; then + true + else + mv -f /etc/testdriverc /etc/testdriverc.old + echo "TestDrive: The configuration format has changed" + echo "TestDrive: Moved /etc/testdriverc to /etc/testdriverc.old" + echo "TestDrive: You may need to merge your customizations into /etc/testdriverc" + fi + fi +fi + +#DEBHELPER# + +exit 0 --- testdrive-2.0.orig/debian/changelog +++ testdrive-2.0/debian/changelog @@ -0,0 +1,401 @@ +testdrive (2.0-0ubuntu1) maverick; urgency=low + + [ Andres Rodriguez ] + * testdrive, testdrive-gtk, testdrive.py, testdriverc: completely + overhaul organization of the code, making it more modular, in + prep for a GTK front end + * Actually remove testdrive-gtk because is was a testing script. + * Add testdrive-common package: + - debian/install: Moved to debian/testdrive.install. + - debian/control: + + Add python related fields, Build-Depends-Indep and Depends. + + Add testdrive-common binary package. + + Move python-launchpadlib Depends to testdrive-common, and + add as a Depend to testdrive binary package. + - debian/rules: Add pycentral rule. + - debian/testdrive-common.install: Added to install shared file. + * Fix the failure of launching the local ISO. (LP: #581067) + + [ Dustin Kirkland ] + * testdrive: + - clean up some unneeded trailing newlines, + - fix unexpanded %s in the help text, LP: #575326 + - support running testdrive -u foo.img, against some existing + kvm qcow2 image (drop testdrive-kvm) + * testdriverc: update header info, clean up config file + * testdrive.install, testdrive.postinst, testdrive.preinst: handle + the conffile syntax change on upgrades + * testdrive, testdrive-kvm, testdrive.py, testdriverc: add -smp + support for kvm runs, LP: #570750 + * doc/testdrive.1: add zync to the supported protocols list, LP: #577900 + + -- Andres Rodriguez Fri, 14 May 2010 15:52:31 +0200 + +testdrive (1.38-0ubuntu1) lucid; urgency=low + + * testdrive: support usb-creator-kde, LP: #570509 + + -- Dustin Kirkland Mon, 26 Apr 2010 21:14:21 -0500 + +testdrive (1.37-0ubuntu1) lucid; urgency=low + + [ Andres Rodriguez ] + * debian/control, testdrive, testdriverc: update the testdrive cache + at most once per week on launch, dynamically determine Ubuntu + development release and cache it, LP: #570485, #553616 + + [ Dustin Kirkland ] + * debian/control: recommend usb-creator for gtk or kde + + -- Dustin Kirkland Mon, 26 Apr 2010 20:27:54 -0500 + +testdrive (1.36-0ubuntu1) lucid; urgency=low + + [ Vish ] + * img/*: LP: #538299, better icons + + [ Dustin Kirkland ] + * Close LP: #554227, in previous upload + + -- Dustin Kirkland Fri, 02 Apr 2010 16:36:46 -0500 + +testdrive (1.35-0ubuntu1) lucid; urgency=low + + * testdrive: need to move the CACHE logic down a few lines + + -- Dustin Kirkland Fri, 02 Apr 2010 16:36:40 -0500 + +testdrive (1.34-0ubuntu1) lucid; urgency=low + + * testdrive: update .cache reference to CACHE_ISO variable, LP: #554227 + + -- Dustin Kirkland Fri, 02 Apr 2010 15:56:10 -0500 + +testdrive (1.33-0ubuntu1) lucid; urgency=low + + * debian/control: recommend kvm-pxe to get rid of warnings now that + pxe roms have moved + * debian/install: install testdrive-kvm binary + + -- Dustin Kirkland Wed, 24 Mar 2010 19:39:17 -0700 + +testdrive (1.32-0ubuntu1) lucid; urgency=low + + * testdriverc: uncomment defaults in testdriverc + * testdrive-kvm: provide a way to run an existing disk image generated + by testdrive, after the fact + * testdrive: improve the kvm/vbox determination logic to handle a few + cornercase bugs, LP: #543329, #542753 + + -- Dustin Kirkland Sun, 21 Mar 2010 09:37:31 -0700 + +testdrive (1.31-0ubuntu1) lucid; urgency=low + + [ Carlos de-Avillez ] + * testdrive, testdriverc: add two new configurate variables for + changing the iso and img cache directories, LP: #539892 + + -- Dustin Kirkland Wed, 17 Mar 2010 14:37:19 -0500 + +testdrive (1.30-0ubuntu1) lucid; urgency=low + + [ Carlos de-Avillez ] + * testdrive: LP: #538238, allow for multiple, different, user config files + + -- Dustin Kirkland Mon, 15 Mar 2010 16:26:20 -0500 + +testdrive (1.29-0ubuntu1) lucid; urgency=low + + * debian/control, testdrive: lower the requirement on cpu-checker to + a recommends, improve the code that uses kvm-ok to not necessarily + depend on it + + -- Dustin Kirkland Thu, 11 Mar 2010 15:36:35 -0600 + +testdrive (1.28-0ubuntu1) lucid; urgency=low + + * debian/control: depend on cpu-checker, which now provides kvm-ok + + -- Dustin Kirkland Wed, 10 Mar 2010 14:12:04 -0600 + +testdrive (1.27-0ubuntu1) lucid; urgency=low + + * doc/testdrive.1: fix manpage verbage, LP: #534712 + + -- Dustin Kirkland Mon, 08 Mar 2010 17:58:38 -0600 + +testdrive (1.26-0ubuntu1) lucid; urgency=low + + * testdrive: remove debug print statement + + -- Dustin Kirkland Tue, 02 Mar 2010 09:05:31 -0600 + +testdrive (1.25-0ubuntu1) lucid; urgency=low + + * testdrive: + - make memory selection slightly more granular for a bit + better performance for guests with >750MB memory, but less than 1GB + - default to choice number 1, if user just hits enter + * testdrive, testdriverc: move the ISO url list building to a conffile + to make maintenance a bit easier after lucid releases + + -- Dustin Kirkland Mon, 01 Mar 2010 21:49:25 -0600 + +testdrive (1.24-0ubuntu1) lucid; urgency=low + + * testdrive: + - fix iso-not-found errors, LP: #526674 + - fix archecture detection logic, LP: #526701 + + -- Dustin Kirkland Fri, 26 Feb 2010 10:34:28 -0600 + +testdrive (1.23-0ubuntu1) lucid; urgency=low + + * testdrive: wget's output is on stderr, handle. LP: #526674 + + -- Dustin Kirkland Tue, 23 Feb 2010 18:35:24 -0600 + +testdrive (1.22-0ubuntu1) lucid; urgency=low + + * testdrive: + - fix run() return value checking, LP: #525438 + - more graceful error if ISO url 404's, LP: #491600 + - remove unnecessary warning when running VB, LP: #486884 + - offer to launch usb-creator after running VM, LP: #507537 + - add a -v|--version option, LP: #526548 + - unconditional print message about cleaning cache, LP: #526546 + - fix typo, LP: #526570 + - clean up output and prompt at the end of a desktop run + * testdrive-select-iso, doc/testdrive-select-iso.1, debian/install, + debian/rules: + - move this file into testdrive, now that testdrive is in python too + * testdriverc: quote sample CACHE value, LP: #524241 + * debian/control: + - allow for non-free virtualbox in package dependencies, LP: #524704 + - drop suggests of testdrivegtk package, LP: #526490 + + -- Dustin Kirkland Tue, 23 Feb 2010 12:27:46 -0600 + +testdrive (1.21-0ubuntu1) lucid; urgency=low + + * testdrive: fix conditional test, LP: #524217 + + -- Dustin Kirkland Thu, 18 Feb 2010 22:31:29 -0600 + +testdrive (1.20-0ubuntu1) lucid; urgency=low + + * testdrive: fix broken handling of --desktop + * testdrive-select-iso: welcome + + -- Dustin Kirkland Sat, 13 Feb 2010 17:38:08 -0600 + +testdrive (1.19-0ubuntu1) lucid; urgency=low + + * testdrive: + - total rewrite in python to make testdrive more translatable + - some commands are allowed to fail -> run(), + others are not -> run_or_die() + - improve file cleanup of vbox empty images + - fix the vbox running grep + - LP: #520680, #518762 - fix erroneous iso check + - LP: #497499 - fix memory override + - must use full path for python execv() + * testdriverc: port to python syntax + * testdrive-select-iso: offer both i386 and amd64 ISO's to amd64 kvm users, + LP: #518069 + + -- Dustin Kirkland Thu, 11 Feb 2010 19:29:47 -0600 + +testdrive (1.18-0ubuntu1) lucid; urgency=low + + * testdrive: + - automatically clean up empty disk images from cache + - allow for omission of the -u parameter + - info message about cleaned disk image + + -- Dustin Kirkland Sat, 06 Feb 2010 22:38:53 -0600 + +testdrive (1.17-0ubuntu1) lucid; urgency=low + + * testdrive-select-iso, testdriverc: netbook remix no longer "remix", + LP: #505909 + * testdrive: fix MEM setting logic, LP: #497499 + + -- Dustin Kirkland Sat, 16 Jan 2010 11:00:36 +1300 + +testdrive (1.16-0ubuntu1) lucid; urgency=low + + * testdrive, testdrive-select-iso: separate the img and iso in the + cache directory + * doc/testdrive.1, testdrive: respect xdg, LP: #501766 + * debian/control: depend on virtualbox >= 3.0.8 (Karmic), which currently + seems to be the oldest successfully tested version of virtualbox to + work with testdrive, LP: #499413 + * testdrive-select-iso: if the user doesn't have VT, then defaul to + i386 images, LP: #497984 + * testdrive, testdrive.desktop: make sure error messages get shown to + the user, if running from the desktop menu, LP: #497955 + + [ Paul Rudkin and Dustin Kirkland ] + * testdrive: support virtualbox 3.1, LP: #495178 + + -- Dustin Kirkland Tue, 12 Jan 2010 14:55:26 -0600 + +testdrive (1.15-0ubuntu1) lucid; urgency=low + + * testdrive: + - improve the copy-and-paste instructions for installing kvm or + virtualbox, LP: #494632 + - show the kvm-ok output, if VIRT=kvm and !kvm-ok, LP: #495746 + + -- Dustin Kirkland Sun, 13 Dec 2009 22:51:18 -0600 + +testdrive (1.14-0ubuntu1) lucid; urgency=low + + [ Dustin Kirkland ] + * testdrive-select-iso: + - loop around input + - improve input exception handling + - allow for ctrl-c canceling + - launch testdrive upon url selection + - fix array indexing + * testdrive: + - source /etc/testdriverc rather than .conf, LP: #485930 + - silence kvm-ok messages, which are misleading when using + VirtualBox, LP: #486884 + - use .img for backing disk tempfile + - launch testdrive-select-iso, if ISO_URL undefined + - dereference symlinks on ls of cache dir + * debian/install: install testdrive-select-iso + * debian/control: depend on python for testdrive-select-iso + * doc/testdrive-select-iso.1: initial manpage, clean it up + + [ Kevin Fullerton ] + * testdrive: Add support for MacOS/Parallels for testdriving Linux ISOs, + LP: #488084 + + -- Dustin Kirkland Thu, 26 Nov 2009 13:48:43 -0600 + +testdrive (1.13-0ubuntu1) lucid; urgency=low + + * testdrive-select-iso: added some code to present a list + and code for selecting an ISO from a list; add GPL header + * COPYING: added GPLv3 copyright file to top level tarball + + -- Dustin Kirkland Wed, 25 Nov 2009 11:22:22 -0600 + +testdrive (1.12-0ubuntu1) lucid; urgency=low + + * testdrive: create temp file names, such that you can run multiple + instances of testdrive + + -- Dustin Kirkland Tue, 17 Nov 2009 15:29:44 -0600 + +testdrive (1.11-0ubuntu1) lucid; urgency=low + + * testdrive: allow for -u paths to local files + + -- Dustin Kirkland Tue, 17 Nov 2009 14:23:42 -0600 + +testdrive (1.10-0ubuntu1) lucid; urgency=low + + * testdrive: fix zsync/wget failover + + -- Dustin Kirkland Tue, 17 Nov 2009 14:14:59 -0600 + +testdrive (1.9-0ubuntu1) lucid; urgency=low + + * testdrivegtk, debian/control, debian/rules, + debian/testdrive-gtk.install: moved to lp:testdrive-gtk project + * testdrive, testdriverc: update for testdriving lucid by default + * bin/*: move testdrive and testdriverc down to the base dir, + drop the testdrivegtk wrapper script for now, remove the bin dir + * testdrive: use rsync compression + + -- Dustin Kirkland Tue, 17 Nov 2009 10:09:05 -0600 + +testdrive (1.8-0ubuntu1) lucid; urgency=low + + * bin/testdrive, bin/testdriverc: allow for the user to specify the + hypervisor type + + -- Dustin Kirkland Thu, 12 Nov 2009 21:08:33 -0600 + +testdrive (1.7-0ubuntu1) lucid; urgency=low + + * bin/testdrive, bin/testdriverc: simplify the configuration drastically, + all we really need is the ISO_URL paramater + + -- Dustin Kirkland Thu, 12 Nov 2009 17:24:37 -0600 + +testdrive (1.6-0ubuntu1) lucid; urgency=low + + * debian/testdrive-gtk.install: install testdrive-gtk's files + + -- Dustin Kirkland Tue, 10 Nov 2009 15:28:49 -0600 + +testdrive (1.5-0ubuntu1) lucid; urgency=low + + * bin/testdrive, debian/control, debian/install, testdrive.desktop: + separate the GTK frontend to a separate binary package, allowing + for testdrive to operate purely from the command line, if necessary + * bin/testdrive, debian/control: add fallback support for VirtualBox; + prefer KVM, but if KVM cannot be used with VT, use VirtualBox instead + + -- Dustin Kirkland Mon, 09 Nov 2009 15:11:54 -0600 + +testdrive (1.4-0ubuntu1) lucid; urgency=low + + [ Dustin Kirkland ] + * bin/testdrive, bin/testdriverc, debian/install: move the bin scripts + to a bin directory, in order to prepare for Rick Spencer's gui merge + * debian/rules: install the binaries properly for gtk to work + * doc/testdrive.1: move to the doc directory + * testdrive.desktop: update the desktop file to point to the gtk launcher + * bin/testdrivegtk: add shell wrapper suitable for /usr/bin installation + * debian/control: depend on python and python-gtk2 + + [ Rick Spencer ] + * Massive merge, adding a gtk frontend to testdrive (testdrivegtk), + https://code.launchpad.net/~rick-rickspencer3/testdrive/gtk-client/+merge/14595 + + -- Dustin Kirkland Sat, 07 Nov 2009 14:25:45 -0600 + +testdrive (1.3-0ubuntu1) lucid; urgency=low + + * testdrive: + - if zsync fails, fall back to wget + + -- Dustin Kirkland Fri, 06 Nov 2009 14:11:27 -0600 + +testdrive (1.2-0ubuntu1) lucid; urgency=low + + * testdrive: + - use kvm-ok to test for VT + - support file:/// + - fix zsync support + - echo error messages to stderr + - add -f and -u parameters + - add a helpful message about cleaning up cache + - use -O rather than -o for wget + - drop fully qualified path to kvm and kvm-img + * testdrive.1: updated for -f and -u parameters + * debian/release*: added some release scripts to help with ppa publication + for backport releases + * debian/control: depend on a particular version of kvm-84 that fixes some + known virtio issues + + -- Dustin Kirkland Fri, 06 Nov 2009 07:27:05 -0600 + +testdrive (1.1~ppa1) karmic; urgency=low + + * testdrive, debian/control: use zsync for http|ftp protocol access, + fail back to curl or wget + + -- Dustin Kirkland Thu, 05 Nov 2009 19:15:57 -0600 + +testdrive (1.0~ppa1) karmic; urgency=low + + * Initial release + + -- Dustin Kirkland Thu, 05 Nov 2009 17:40:20 -0600 --- testdrive-2.0.orig/debian/release-build.sh +++ testdrive-2.0/debian/release-build.sh @@ -0,0 +1,36 @@ +#!/bin/sh -e + +PKG="testdrive" +MAJOR=1 + +error() { + echo "ERROR: $@" + exit 1 +} + +head -n1 debian/changelog | grep -i "unreleased" || error "This version must be 'unreleased'" + +./debian/rules release-upstream +bzr bd +sed -i "s/) unreleased;/-0ubuntu1~ppa1) hardy;/i" debian/changelog +bzr bd -S +sed -i "s/ppa1) hardy;/ppa2) intrepid;/" debian/changelog +bzr bd -S +sed -i "s/ppa2) intrepid;/ppa3) jaunty;/" debian/changelog +bzr bd -S +sed -i "s/ppa3) jaunty;/ppa4) karmic;/" debian/changelog +bzr bd -S +sed -i "s/ppa4) karmic;/ppa5) lucid;/" debian/changelog +bzr bd -S +sed -i "s/~ppa5//" debian/changelog +bzr bd -S + +echo +echo +echo "# Test this build:" +echo " sudo dpkg -i ../*.deb" +echo +echo "# If everything looks good, release:" +echo " ./debian/release.sh" +echo +echo --- testdrive-2.0.orig/debian/testdrive.install +++ testdrive-2.0/debian/testdrive.install @@ -0,0 +1,5 @@ +testdrive usr/bin/ +testdriverc etc/ +testdrive.desktop usr/share/applications/ +img/testdrive.png usr/share/testdrive/ +testdriverc usr/share/testdrive/ --- testdrive-2.0.orig/debian/release.sh +++ testdrive-2.0/debian/release.sh @@ -0,0 +1,38 @@ +#!/bin/sh -e + +PKG="testdrive" +MAJOR=1 + +error() { + echo "ERROR: $@" + exit 1 +} + +head -n1 debian/changelog | grep "lucid" || error "This version must be ready for 'lucid'" + +# Tag the release in bzr +minor=`head -n1 debian/changelog | sed "s/^.*($MAJOR.//" | sed "s/-.*$//"` +dch --release +debcommit --release --message="releasing $MAJOR.$minor" + +# Sign the tarball +gpg --armor --sign --detach-sig ../"$PKG"_*.orig.tar.gz + +# Open the next release for development +nextminor=`expr $minor + 1` +dch -v "$MAJOR.$nextminor" "UNRELEASED" +sed -i "s/$MAJOR.$nextminor) .*;/$MAJOR.$nextminor) unreleased;/" debian/changelog +bzr commit -m "opening $MAJOR.$nextminor" + +echo +echo "# To push:" +echo " bzr push lp:$PKG" +echo +echo "# To upload:" +echo " dput $PKG-ppa ../*ppa*changes" +echo " dput ../${PKG}_${MAJOR}.${minor}-0ubuntu1_source.changes" +echo +echo "# Publish tarball at:" +echo " https://launchpad.net/$PKG/trunk/+addrelease" +echo +echo --- testdrive-2.0.orig/debian/compat +++ testdrive-2.0/debian/compat @@ -0,0 +1 @@ +6