TestDrive

Merge lp:~andreserl/testdrive/updates into lp:testdrive

  1. updates
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Merged at revision: 393
Proposed branch: lp:~andreserl/testdrive/updates
Merge into: lp:testdrive
Diff against target: 128 lines (+35/-13)
6 files modified
debian/changelog (+13/-1)
debian/control (+2/-2)
debian/testdrive-gtk.install (+1/-1)
doc/testdrive.1 (+9/-9)
setup.cfg (+2/-0)
testdrive-gtk.desktop (+8/-0)
To merge this branch: bzr merge lp:~andreserl/testdrive/updates
Reviewer Review Type Date Requested Status
testdrive Pending
Review via email: mp+149744@code.launchpad.net
To post a comment you must log in.
lp:~andreserl/testdrive/updates updated
392. By Andres Rodriguez

Update changelog

393. By Andres Rodriguez

Update changelog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-13 18:01:28 +0000
3+++ debian/changelog 2013-02-21 02:56:21 +0000
4@@ -1,7 +1,19 @@
5 testdrive (3.17) unreleased; urgency=low
6
7 [Benjamin Kerensa]
8- * Fix hang on "Configuring Virtual Machine" when Virtualbox 4.2 installed. (LP: #1098080)
9+ * Fix hang on "Configuring Virtual Machine" when Virtualbox 4.2
10+ installed. (LP: #1098080)
11+
12+ [ Andres Rodriguez ]
13+ * debian/control:
14+ - Bump Standards Version to 3.9.3
15+ - testdrive-common depends on python-xdg (LP: #1023571)
16+ * Make package more lintian clean (LP: #1079259)
17+ - doc/testdrive.1: Fix manpage.
18+ * disable build of i18n:
19+ - setup.cfg: Add to disable i18n as it causes a broken build.
20+ - testdrive-gtk.desktop: Add. Doesn't support translations.
21+ - debian/testdrive-gtk.install: Install new .desktop file.
22
23 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 17 May 2012 12:18:20 -0400
24
25
26=== modified file 'debian/control'
27--- debian/control 2012-05-17 16:15:24 +0000
28+++ debian/control 2013-02-21 02:56:21 +0000
29@@ -3,7 +3,7 @@
30 Priority: extra
31 Maintainer: Andres Rodriguez <andreserl@ubuntu.com>
32 XSBC-Original-Maintainer: Dustin Kirkland <kirkland@ubuntu.com>
33-Standards-Version: 3.8.3
34+Standards-Version: 3.9.3
35 Build-Depends: debhelper (>= 7), gettext-base, python (>= 2.6.6-3~), python-distutils-extra (>= 2.10)
36 XS-Python-Version: current
37 Homepage: http://launchpad.net/testdrive
38@@ -25,6 +25,7 @@
39 Architecture: all
40 Depends: ${python:Depends}, ${misc:Depends},
41 qemu-kvm | kvm ( >= 1:84+dfsg-0ubuntu12.4 ) | virtualbox-ose ( >= 3.1.6) | virtualbox-3.1 | virtualbox-3.2 | virtualbox-4.0,
42+ python-xdg,
43 rsync,
44 wget
45 Recommends: zsync, usb-creator-gtk | usb-creator-kde, cpu-checker, kvm-pxe
46@@ -65,7 +66,6 @@
47 testdrive-common (= ${source:Version}),
48 python-gtk2,
49 python-notify,
50- python-xdg,
51 python-indicate
52 Description: run the daily Ubuntu ISO in a virtual machine (GTK Front-end)
53 Testdrive helps you download and run the daily Ubuntu development ISO
54
55=== modified file 'debian/testdrive-gtk.install'
56--- debian/testdrive-gtk.install 2011-02-22 20:28:46 +0000
57+++ debian/testdrive-gtk.install 2013-02-21 02:56:21 +0000
58@@ -2,6 +2,6 @@
59 debian/tmp/usr/lib/python*/*/testdrivegtk/__init__.py
60 debian/tmp/usr/share/testdrivegtk
61 debian/tmp/usr/bin/testdrive-gtk
62-debian/tmp/usr/share/applications/testdrive-gtk.desktop
63+testdrive-gtk.desktop usr/share/applications/
64 #debian/tmp/usr/share/pixmaps/testdrive-gtk.xpm
65 #debian/tmp/usr/share/indicators/messages/applications/testdrive-gtk
66
67=== modified file 'doc/testdrive.1'
68--- doc/testdrive.1 2011-10-31 15:36:17 +0000
69+++ doc/testdrive.1 2013-02-21 02:56:21 +0000
70@@ -12,7 +12,7 @@
71
72 \fB\-f FILE\fP - path to a configuration file to read
73
74-\fB\-l FLAVOR\fP - hardcode Ubuntu flavor to testdrive; can be [ubuntu|kubuntu|xubuntu|edubuntu|myhbuntu|ubuntustudio|lubuntu|cloud-server]
75+\fB\-l FLAVOR\fP - hardcode Ubuntu flavor to testdrive; can be [ubuntu | kubuntu | xubuntu | edubuntu | myhbuntu | ubuntustudio | lubuntu | cloud-server]
76
77 \fB\-p REPOSITORY\fP - select Ubuntu repositoru; can be [cdimage|releases|cloud-daily]
78
79@@ -45,13 +45,13 @@
80
81 Specify repository and flavor (Defaults to latest Ubuntu release available):
82 .RS
83-testdrive \-p cdimage -l kubuntu
84-.RE
85-.RS
86-testdrive \-p releases -l kubuntu
87-.RE
88-.RS
89-testdrive \-p cloud-daily -l cloud-server
90+testdrive \-p cdimage \-l kubuntu
91+.RE
92+.RS
93+testdrive \-p releases \-l kubuntu
94+.RE
95+.RS
96+testdrive \-p cloud-daily \-l cloud-server
97 .RE
98
99 Launch local ISO image:
100@@ -66,7 +66,7 @@
101
102 Launch Cloud local image with KVM curses
103 .RS
104-testdrive \-u /local/path/to/cloud-image.tar.gz --curses
105+testdrive \-u /local/path/to/cloud-image.tar.gz \-\-curses
106 .RE
107
108 .SH FILES
109
110=== added file 'setup.cfg'
111--- setup.cfg 1970-01-01 00:00:00 +0000
112+++ setup.cfg 2013-02-21 02:56:21 +0000
113@@ -0,0 +1,2 @@
114+[build]
115+i18n=False
116
117=== added file 'testdrive-gtk.desktop'
118--- testdrive-gtk.desktop 1970-01-01 00:00:00 +0000
119+++ testdrive-gtk.desktop 2013-02-21 02:56:21 +0000
120@@ -0,0 +1,8 @@
121+[Desktop Entry]
122+Name=Test Drive an Ubuntu ISO
123+Comment=Download and run an Ubuntu ISO in a Virtual Machine
124+Categories=Utility;System;
125+Exec=testdrive-gtk
126+Icon=testdrive-gtk
127+Terminal=false
128+Type=Application

Subscribers

People subscribed via source and target branches