1
=== modified file 'debian/control'
2
--- debian/control	2014-10-30 08:10:12 +0000
3
+++ debian/control	2015-01-23 16:16:27 +0000
4
@@ -11,9 +11,11 @@
5
11
               gir1.2-ibus-1.0,
11
               gir1.2-ibus-1.0,
6
12
               gir1.2-ubuntu-app-launch-2 | gir1.2-upstart-app-launch-2,
12
               gir1.2-ubuntu-app-launch-2 | gir1.2-upstart-app-launch-2,
7
13
               graphviz,
13
               graphviz,
8
14
               imagemagick,
9
14
               libjs-jquery,
15
               libjs-jquery,
10
15
               libjs-underscore,
16
               libjs-underscore,
11
16
               liblttng-ust-dev,
17
               liblttng-ust-dev,
12
18
               librsvg2-bin,
13
17
               python3-all-dev (>= 3.4),
19
               python3-all-dev (>= 3.4),
14
18
               python3-dateutil,
20
               python3-dateutil,
15
19
               python3-dbus,
21
               python3-dbus,
16
@@ -32,6 +34,7 @@
17
32
               python3-testtools,
34
               python3-testtools,
18
33
               python3-xlib,
35
               python3-xlib,
19
34
               sphinx-common,
36
               sphinx-common,
20
37
               texlive-fonts-recommended,
21
35
               texlive-latex-extra,
38
               texlive-latex-extra,
22
36
Standards-Version: 3.9.5
39
Standards-Version: 3.9.5
23
37
Homepage: https://launchpad.net/autopilot
40
Homepage: https://launchpad.net/autopilot
24
38
41
25
=== modified file 'debian/rules' (properties changed: -x to +x)
26
--- debian/rules	2014-07-23 03:37:24 +0000
27
+++ debian/rules	2015-01-23 16:16:27 +0000
28
@@ -4,6 +4,12 @@
29
4
# Uncomment this to turn on verbose mode.
4
# Uncomment this to turn on verbose mode.
30
5
# export DH_VERBOSE=1
5
# export DH_VERBOSE=1
31
6
6
32
7
%.pdf : %.svg
33
8
	convert $< $@
34
9
35
10
# find .svgs, make list of .pdfs to generate
36
11
PDFs := $(patsubst %.svg,%.pdf,$(wildcard $(CURDIR)/docs/images/*.svg))
37
12
38
7
%:
13
%:
39
8
	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
14
	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
40
9
15
41
@@ -11,11 +17,13 @@
42
11
	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745690
17
	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745690
43
12
	-dh_sphinxdoc
18
	-dh_sphinxdoc
44
13
19
46
14
override_dh_auto_build:
20
override_dh_auto_build: $(PDFs)
47
15
	python3 -m flake8.run .
21
	python3 -m flake8.run .
48
16
	dh_auto_build
22
	dh_auto_build
49
17
	python3 setup.py build_sphinx -b html
23
	python3 setup.py build_sphinx -b html
50
18
	python3 setup.py build_sphinx -b man
24
	python3 setup.py build_sphinx -b man
51
25
	python3 setup.py build_sphinx -b latex
52
26
	$(MAKE) -C $(CURDIR)/build/sphinx/latex all-pdf
53
19
27
54
20
override_dh_auto_test:
28
override_dh_auto_test:
55
21
ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
29
ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
56
22
30
57
=== modified file 'docs/man.rst'
58
--- docs/man.rst	2015-01-21 05:28:45 +0000
59
+++ docs/man.rst	2015-01-23 16:16:27 +0000
60
@@ -16,8 +16,8 @@
61
16
General Options
16
General Options
62
17
       -h, --help
17
       -h, --help
63
18
            Get help from autopilot. This command can also be present after  a
18
            Get help from autopilot. This command can also be present after  a
66
19
            sub-command (such as run or list) to get help on the specific com‐
19
            sub-command (such as run or list) to get help on the specific com-
67
20
            mand.  Further options are restricted to particular autopilot com‐
20
            mand.  Further options are restricted to particular autopilot com-
68
21
            mands.
21
            mands.
69
22
22
70
23
       -v, --version
23
       -v, --version
71
@@ -35,7 +35,7 @@
72
35
            See `SPECIFYING SUITES`_
35
            See `SPECIFYING SUITES`_
73
36
36
74
37
       -ro, --run-order
37
       -ro, --run-order
76
38
            List tests in the order they will be run in, rather than alphabet‐
38
            List tests in the order they will be run in, rather than alphabet-
77
39
            ically (which is the default).
39
            ically (which is the default).
78
40
40
79
41
       --suites
41
       --suites
80
@@ -49,7 +49,7 @@
81
49
49
82
50
       -o FILE, --output FILE
50
       -o FILE, --output FILE
83
51
            Specify where the test log should be written. Defaults to  stdout.
51
            Specify where the test log should be written. Defaults to  stdout.
85
52
            If  a directory is specified the file will be created with a file‐
52
            If  a directory is specified the file will be created with a file-
86
53
            name of <hostname>_<dd.mm.yyy_HHMMSS>.log
53
            name of <hostname>_<dd.mm.yyy_HHMMSS>.log
87
54
54
88
55
       -f FORMAT, --format FORMAT
55
       -f FORMAT, --format FORMAT
89
@@ -60,7 +60,7 @@
90
60
            Stop the test run on the first error or failure.
60
            Stop the test run on the first error or failure.
91
61
61
92
62
       -r, --record
62
       -r, --record
94
63
            Record failed tests. Using this option requires the 'recordmydesk‐
63
            Record failed tests. Using this option requires the 'recordmydesk-
95
64
            top' application be installed. By default, videos  are  stored  in
64
            top' application be installed. By default, videos  are  stored  in
96
65
            /tmp/autopilot
65
            /tmp/autopilot
97
66
66
Status:	Needs review
Proposed branch:	lp:~canonical-platform-qa/autopilot/pdf-build
Merge into:	lp:autopilot
Diff against target:	96 lines (+17/-6) 3 files modified debian/control (+3/-0) debian/rules (+9/-1) docs/man.rst (+5/-5)
To merge this branch:	bzr merge lp:~canonical-platform-qa/autopilot/pdf-build
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
platform-qa-bot	continuous-integration		Approve on 2016-01-19
PS Jenkins bot	continuous-integration		Approve on 2015-01-26
Martin Pitt (community)			Needs Fixing on 2015-01-23
Thomi Richards (community)		2015-01-22	Approve on 2015-01-22
Review via email: mp+247249@code.launchpad.net