1
=== renamed file 'bin/autopilot-sandbox-run' => 'bin/autopilot3-sandbox-run'
2
--- bin/autopilot-sandbox-run	2013-09-13 14:00:56 +0000
3
+++ bin/autopilot3-sandbox-run	2014-05-19 06:12:26 +0000
4
@@ -34,7 +34,6 @@
5
34
XVFB_CMD="$(which Xvfb||true)"
34
XVFB_CMD="$(which Xvfb||true)"
6
35
XVFB_OPT=""
35
XVFB_OPT=""
7
36
36
8
37
AP_CMD="$(which autopilot)"
9
38
AP_OPT=""
37
AP_OPT=""
10
39
38
11
40
SERVERNUM=5
39
SERVERNUM=5
12
@@ -173,6 +172,5 @@
13
173
export XAUTHORITY=/dev/null
172
export XAUTHORITY=/dev/null
14
174
wait_for_x $SERVERNUM
173
wait_for_x $SERVERNUM
15
175
echo "I: Starting autopilot"
174
echo "I: Starting autopilot"
17
176
dbus-launch --exit-with-session autopilot run $AP_OPT $TESTLIST
175
dbus-launch --exit-with-session python3 -m autopilot.run run $AP_OPT $TESTLIST || RC=$?
18
177
echo "I: autopilot tests done"
176
echo "I: autopilot tests done"
19
178
RC=$?
20
179
177
21
=== modified file 'debian/changelog'
22
--- debian/changelog	2014-05-07 23:16:37 +0000
23
+++ debian/changelog	2014-05-19 06:12:26 +0000
24
@@ -1,5 +1,6 @@
26
1
autopilot (1.5.0-0ubuntu5) UNRELEASED; urgency=low
1
autopilot (1.5.0+14.10.20140509-0ubuntu1) utopic; urgency=low
27
2
2
28
3
  [ Thomi Richards ]
29
3
  * Remove python2 packages and dependencies, as they're now handled by the
4
  * Remove python2 packages and dependencies, as they're now handled by the
30
4
    autopilot-legacy source package. (lp: #1308661)
5
    autopilot-legacy source package. (lp: #1308661)
31
5
  * Autopilot vis tool can now search the introspection tree. (lp: #1097392)
6
  * Autopilot vis tool can now search the introspection tree. (lp: #1097392)
32
@@ -15,7 +16,7 @@
33
15
  * Test result artifacts are no longer overwritten when more than one artifact with
16
  * Test result artifacts are no longer overwritten when more than one artifact with
34
16
    the same name is added to a test result (lp: #1214246)
17
    the same name is added to a test result (lp: #1214246)
35
17
18
37
18
 -- Thomi Richards <thomi.richards@canonical.com>  Tue, 29 Apr 2014 11:11:32 +1200
19
 -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Fri, 09 May 2014 00:48:14 +0000
38
19
20
39
20
autopilot (1.4+14.04.20140416-0ubuntu1) trusty; urgency=low
21
autopilot (1.4+14.04.20140416-0ubuntu1) trusty; urgency=low
40
21
22
41
22
23
42
=== modified file 'debian/control'
43
--- debian/control	2014-05-05 20:26:43 +0000
44
+++ debian/control	2014-05-19 06:12:26 +0000
45
@@ -99,6 +99,7 @@
46
99
Architecture: all
99
Architecture: all
47
100
Section: metapackages
100
Section: metapackages
48
101
Depends: ${misc:Depends},
101
Depends: ${misc:Depends},
49
102
         at-spi2-core,
50
102
         gir1.2-gconf-2.0,
103
         gir1.2-gconf-2.0,
51
103
         gir1.2-glib-2.0,
104
         gir1.2-glib-2.0,
52
104
         gir1.2-gtk-3.0,
105
         gir1.2-gtk-3.0,
53
@@ -121,7 +122,6 @@
54
121
         python3-dbus.mainloop.qt,
122
         python3-dbus.mainloop.qt,
55
122
         python3-pyqt4,
123
         python3-pyqt4,
56
123
Recommends: python3-lxml,
124
Recommends: python3-lxml,
57
124
            python3-dbus.mainloop.qt,
58
125
Description: visualisation application for Autopilot (Python 3)
125
Description: visualisation application for Autopilot (Python 3)
59
126
 The Autopilot vis tool allows you to inspect an application introspection
126
 The Autopilot vis tool allows you to inspect an application introspection
60
127
 tree. It is a useful tool for test authors, but not required to run autopilot
127
 tree. It is a useful tool for test authors, but not required to run autopilot
61
128
128
62
=== modified file 'debian/python3-autopilot.install'
63
--- debian/python3-autopilot.install	2014-04-29 00:35:12 +0000
64
+++ debian/python3-autopilot.install	2014-05-19 06:12:26 +0000
65
@@ -1,5 +1,6 @@
66
1
debian/61-autopilot3-uinput.rules /lib/udev/rules.d
1
debian/61-autopilot3-uinput.rules /lib/udev/rules.d
67
2
usr/bin/autopilot3 /usr/bin/
2
usr/bin/autopilot3 /usr/bin/
68
3
usr/bin/autopilot3-sandbox-run /usr/bin/
69
3
usr/lib/python3*/*/autopilot*.egg-info
4
usr/lib/python3*/*/autopilot*.egg-info
70
4
usr/lib/python3*/*/autopilot/*.py
5
usr/lib/python3*/*/autopilot/*.py
71
5
usr/lib/python3*/*/autopilot/application/*.py
6
usr/lib/python3*/*/autopilot/application/*.py
72
6
7
73
=== modified file 'setup.py'
74
--- setup.py	2014-04-29 17:02:20 +0000
75
+++ setup.py	2014-05-19 06:12:26 +0000
76
@@ -44,7 +44,7 @@
77
44
    license='GPLv3',
44
    license='GPLv3',
78
45
    packages=find_packages(),
45
    packages=find_packages(),
79
46
    test_suite='autopilot.tests',
46
    test_suite='autopilot.tests',
81
47
    scripts=['bin/autopilot-sandbox-run'],
47
    scripts=['bin/autopilot3-sandbox-run'],
82
48
    ext_modules=[autopilot_tracepoint],
48
    ext_modules=[autopilot_tracepoint],
83
49
    entry_points={
49
    entry_points={
84
50
        'console_scripts': ['autopilot3 = autopilot.run:main']
50
        'console_scripts': ['autopilot3 = autopilot.run:main']
Status:	Merged
Approved by:	Thomi Richards on 2014-05-19
Approved revision:	492
Merged at revision:	505
Proposed branch:	lp:~pitti/autopilot/sandbox-run
Merge into:	lp:~autopilot/autopilot/temp-dev
Diff against target:	84 lines (+7/-7) 5 files modified bin/autopilot3-sandbox-run (+1/-3) debian/changelog (+3/-2) debian/control (+1/-1) debian/python3-autopilot.install (+1/-0) setup.py (+1/-1)
To merge this branch:	bzr merge lp:~pitti/autopilot/sandbox-run
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-05-19	Approve on 2014-05-19
Thomi Richards (community)			Approve on 2014-05-19
Review via email: mp+219982@code.launchpad.net