1
=== modified file 'README'
2
--- README	2013-04-24 17:09:29 +0000
3
+++ README	2013-12-17 19:57:06 +0000
4
@@ -47,6 +47,26 @@
5
47
Documentation
47
Documentation
6
48
-------------
48
-------------
7
49
49
8
50
Main Documentation (QDocs):
9
51
+++++++++++++++++++++++++++
10
52
11
50
Once built, you may view the documentation by opening  
53
Once built, you may view the documentation by opening  
14
51
  documentation/html/overview-ubuntu-sdk.html
54
`documentation/html/overview-ubuntu-sdk.html` in your favorite web browser.
15
52
in your favorite web browser.
55
16
56
17
57
Autopilot Emulators (Sphinx docs):
18
58
++++++++++++++++++++++++++++++++++
19
59
20
60
To build the AutoPilot Emulators API documentation (html),
21
61
  
22
62
  * install python-sphinx::
23
63
24
64
        $ sudo apt-get install python-sphinx
25
65
    
26
66
  * from the branch's root, run::
27
67
28
68
        $ sphinx-build -b html docs-autopilot-emulator emulator-html
29
69
30
70
  * Once built, you may view the documentation by opening
31
71
    `emulator-html/ubuntuuitoolkit.html` in your favorite web browser.
32
72
33
53
73
34
=== modified file 'debian/changelog'
35
--- debian/changelog	2013-11-29 20:24:58 +0000
36
+++ debian/changelog	2013-12-17 19:57:06 +0000
37
@@ -275,6 +275,12 @@
38
275
275
39
276
 -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 05 Nov 2013 16:51:13 +0000
276
 -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 05 Nov 2013 16:51:13 +0000
40
277
277
41
278
ubuntu-ui-toolkit (0.1.46+13.10.20131011.2-0ubuntu2) UNRELEASED; urgency=low
42
279
43
280
  * add sphinx documentation
44
281
45
282
 -- Nicholas Skaggs <nicholas.skaggs@canonical.com>  Tue, 29 Oct 2013 17:28:30 -0400
46
283
47
278
ubuntu-ui-toolkit (0.1.46+13.10.20131011.2-0ubuntu1) saucy; urgency=low
284
ubuntu-ui-toolkit (0.1.46+13.10.20131011.2-0ubuntu1) saucy; urgency=low
48
279
285
49
280
  [ Zsombor Egri ]
286
  [ Zsombor Egri ]
50
281
287
51
=== modified file 'debian/control'
52
--- debian/control	2013-12-02 05:35:06 +0000
53
+++ debian/control	2013-12-17 19:57:06 +0000
54
@@ -40,8 +40,8 @@
55
40
               locales,
40
               locales,
56
41
Standards-Version: 3.9.4
41
Standards-Version: 3.9.4
57
42
Homepage: https://launchpad.net/ubuntu-ui-toolkit
42
Homepage: https://launchpad.net/ubuntu-ui-toolkit
60
43
# If you aren't a member of ~ubuntu-sdk-team but need to upload packaging 
43
# If you aren't a member of ~ubuntu-sdk-team but need to upload packaging
61
44
# changes, just go ahead. ~ubuntu-sdk-team will notice and sync up the code 
44
# changes, just go ahead. ~ubuntu-sdk-team will notice and sync up the code
62
45
# again.
45
# again.
63
46
Vcs-Bzr: https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk
46
Vcs-Bzr: https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk
64
47
47
65
@@ -132,6 +132,7 @@
66
132
         libqt5widgets5,
132
         libqt5widgets5,
67
133
         python-autopilot (>= 1.4),
133
         python-autopilot (>= 1.4),
68
134
         python-mock,
134
         python-mock,
69
135
         python-sphinx,
70
135
         ubuntu-ui-toolkit-examples (>= ${source:Version}),
136
         ubuntu-ui-toolkit-examples (>= ${source:Version}),
71
136
Description: Test package for Ubuntu UI Toolkit
137
Description: Test package for Ubuntu UI Toolkit
72
137
 Autopilot tests for the ubuntu-ui-toolkit package
138
 Autopilot tests for the ubuntu-ui-toolkit package
73
138
139
74
=== modified file 'debian/rules'
75
--- debian/rules	2013-10-14 15:59:19 +0000
76
+++ debian/rules	2013-12-17 19:57:06 +0000
77
@@ -8,8 +8,10 @@
78
8
%:
8
%:
79
9
	dh $@ --fail-missing
9
	dh $@ --fail-missing
80
10
10
81
11
82
11
override_dh_install:
12
override_dh_install:
83
12
	dh_auto_build -- docs
13
	dh_auto_build -- docs
85
13
	mkdir -p debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch 
14
	sphinx-build -b html docs-autopilot-emulator emulator-html
86
15
	mkdir -p debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch
87
14
	dh_install --fail-missing
16
	dh_install --fail-missing
88
15
17
89
16
18
90
=== added directory 'docs-autopilot-emulator'
91
=== added directory 'docs-autopilot-emulator/_static'
92
=== added file 'docs-autopilot-emulator/_static/favicon.ico'
93
17
Binary files docs-autopilot-emulator/_static/favicon.ico	1970-01-01 00:00:00 +0000 and docs-autopilot-emulator/_static/favicon.ico	2013-12-17 19:57:06 +0000 differ
19
Binary files docs-autopilot-emulator/_static/favicon.ico	1970-01-01 00:00:00 +0000 and docs-autopilot-emulator/_static/favicon.ico	2013-12-17 19:57:06 +0000 differ
94
=== added file 'docs-autopilot-emulator/_static/nature.css'
95
--- docs-autopilot-emulator/_static/nature.css	1970-01-01 00:00:00 +0000
96
+++ docs-autopilot-emulator/_static/nature.css	2013-12-17 19:57:06 +0000
97
@@ -0,0 +1,211 @@
98
1
/*
99
2
	Copyright 2013 Canonical Ltd.
100
3
*/
101
4
 
102
5
 @import url(basic.css);
103
6
104
7
body {
105
8
	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
106
9
	font-size:100%;
107
10
	background-color:#2C001E;
108
11
	margin:0;
109
12
	padding:0;
110
13
	}
111
14
112
15
div.documentwrapper {
113
16
	float:left;
114
17
	width:100%;
115
18
}
116
19
117
20
div.bodywrapper {
118
21
	margin:0 0 0 0;
119
22
}
120
23
121
24
hr {
122
25
	border:1px solid #B1B4B6;
123
26
}
124
27
125
28
div.body {
126
29
	background-color:#FFF;
127
30
	color:#3E4349;
128
31
	font-size:.9em;
129
32
	padding:0 30px 30px;
130
33
}
131
34
132
35
div.footer {
133
36
	color:#CCC;
134
37
	width:100%;
135
38
	text-align:center;
136
39
	font-size:75%;
137
40
	padding:13px 0;
138
41
}
139
42
140
43
div.footer a {
141
44
	color:#444;
142
45
	text-decoration:underline;
143
46
}
144
47
145
48
div.related {
146
49
	background-color:#DD4814;
147
50
	line-height:32px;
148
51
	color:#fff;
149
52
	font-size:.9em;
150
53
}
151
54
152
55
div.related a {
153
56
	color:#EEE;
154
57
}
155
58
156
59
div.sphinxsidebar {
157
60
	font-size:.75em;
158
61
	line-height:1.5em;
159
62
}
160
63
161
64
div.sphinxsidebarwrapper {
162
65
	padding:20px 0;
163
66
}
164
67
165
68
div.sphinxsidebar h3,
166
69
div.sphinxsidebar h4 {
167
70
	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
168
71
	color:#222;
169
72
	font-size:1.2em;
170
73
	font-weight:400;
171
74
	background-color:#ddd;
172
75
	margin:0;
173
76
	padding:5px 10px;
174
77
}
175
78
176
79
div.sphinxsidebar p {
177
80
	color:#444;
178
81
	padding:2px 10px;
179
82
}
180
83
181
84
div.sphinxsidebar ul {
182
85
	color:#000;
183
86
	margin:10px 5px;
184
87
	padding:0;
185
88
}
186
89
187
90
div.sphinxsidebar input {
188
91
	border:1px solid #ccc;
189
92
	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
190
93
	font-size:1em;
191
94
}
192
95
193
96
div.sphinxsidebar input[type=text] {
194
97
	margin-left:5px;
195
98
}
196
99
197
100
a {
198
101
	color:#5E2750;
199
102
	text-decoration:none;
200
103
}
201
104
202
105
a:hover {
203
106
	color:#DD4814;
204
107
	text-decoration:underline;
205
108
}
206
109
207
110
div.body h1 {
208
111
	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
209
112
	font-weight:bold;
210
113
	font-size:200%;
211
114
	color:#444;
212
115
	margin:20px 0 10px;
213
116
	padding:5px 0 5px 10px;
214
117
}
215
118
216
119
div.body h2 {
217
120
	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
218
121
	font-size:130%;
219
122
	background-color:#CCC;
220
123
	margin:20px 0 10px;
221
124
	padding:5px 0 5px 10px;
222
125
}
223
126
224
127
div.body h6 {
225
128
	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
226
129
	background-color:#BED4EB;
227
130
	font-weight:400;
228
131
	color:#333;
229
132
	margin:30px 0 10px;
230
133
	padding:5px 0 5px 10px;
231
134
}
232
135
233
136
a.headerlink {
234
137
	text-decoration:none;
235
138
	padding:0 4px;
236
139
}
237
140
238
141
a.headerlink:hover {
239
142
	background-color:#AEA79F;
240
143
	color:#FFF;
241
144
}
242
145
243
146
div.body p,div.body dd,div.body li {
244
147
	line-height:1.5em;
245
148
}
246
149
247
150
div.highlight {
248
151
	background-color:#FFF;
249
152
}
250
153
251
154
div.note {
252
155
	background-color:#eee;
253
156
	border:1px solid #ccc;
254
157
}
255
158
256
159
div.seealso {
257
160
	background-color:#ffc;
258
161
	border:1px solid #ff6;
259
162
}
260
163
261
164
div.warning {
262
165
	background-color:#ffe4e4;
263
166
	border:1px solid #f66;
264
167
}
265
168
266
169
p.admonition-title:after {
267
170
	content:":";
268
171
}
269
172
270
173
pre {
271
174
	background-color:#EFEFEF;
272
175
	color:#000;
273
176
	line-height:1.1em;
274
177
	border:1px solid #C6C9CB;
275
178
	font-size:1.2em;
276
179
	font-family:"Ubuntu Mono", Monaco, Consolas, "DejaVu Sans Mono", "Lucida Console", monospace;
277
180
	margin:1.5em 0;
278
181
	padding:6px;
279
182
}
280
183
281
184
tt {
282
185
	background-color:#EFEFEF;
283
186
	color:#222;
284
187
	font-size:1.1em;
285
188
	font-family:"Ubuntu Mono", Monaco, Consolas, "DejaVu Sans Mono", "Lucida Console", monospace;
286
189
}
287
190
288
191
.viewcode-back {
289
192
	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
290
193
}
291
194
292
195
div.viewcode-block:target {
293
196
	background-color:#f4debf;
294
197
	border-top:1px solid #ac9;
295
198
	border-bottom:1px solid #ac9;
296
199
}
297
200
298
201
div.document,div.topic {
299
202
 background-color:#eee;
300
203
}
301
204
302
205
div.sphinxsidebar h3 a,div.sphinxsidebar a {
303
206
 color:#444;
304
207
}
305
208
306
209
div.admonition p.admonition-title + p,p.admonition-title {
307
210
	display:inline;
308
211
}
309
0
212
310
=== added directory 'docs-autopilot-emulator/_templates'
311
=== added file 'docs-autopilot-emulator/_templates/layout.html'
312
--- docs-autopilot-emulator/_templates/layout.html	1970-01-01 00:00:00 +0000
313
+++ docs-autopilot-emulator/_templates/layout.html	2013-12-17 19:57:06 +0000
314
@@ -0,0 +1,28 @@
315
1
<!--
316
2
    Copyright 2013 Canonical Ltd.
317
3
-->
318
4
319
5
{#
320
6
    default/layout.html
321
7
    ~~~~~~~~~~~~~~~~~~~
322
8
323
9
    Sphinx layout template for the default theme.
324
10
325
11
    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
326
12
    :license: BSD, see LICENSE for details.
327
13
#}
328
14
{% extends "basic/layout.html" %}
329
15
330
16
{%- block content %}
331
17
<div class="document">
332
18
  {%- block document %}
333
19
      <div class="documentwrapper">
334
20
      {%- if render_sidebar %}
335
21
        <div class="bodywrapper">
336
22
      {%- endif %}
337
23
          <div class="body">
338
24
            {% block body %} {% endblock %}
339
25
          </div>
340
26
      </div>
341
27
  {%- endblock %}
342
28
{%- endblock %}
343
0
\ No newline at end of file
29
\ No newline at end of file
344
1
30
345
=== added file 'docs-autopilot-emulator/conf.py'
346
--- docs-autopilot-emulator/conf.py	1970-01-01 00:00:00 +0000
347
+++ docs-autopilot-emulator/conf.py	2013-12-17 19:57:06 +0000
348
@@ -0,0 +1,285 @@
349
1
#-*- coding: utf-8 -*-
350
2
#
351
3
#ubuntu-ui-toolkit-autopilot documentation build configuration file, created by
352
4
#sphinx-quickstart on Fri Jul 26 12:12:45 2013.
353
5
#
354
6
#This file is execfile()d with the current directory set to its containing dir.
355
7
#
356
8
#Note that not all possible configuration values are present in this
357
9
#autogenerated file.
358
10
#
359
11
#All configuration values have a default; values that are commented out
360
12
#serve to show the default.
361
13
362
14
import sys, os
363
15
364
16
#If extensions (or modules to document with autodoc) are in another directory,
365
17
#add these directories to sys.path here. If the directory is relative to the
366
18
#documentation root, use os.path.abspath to make it absolute, like shown here.
367
19
sys.path.insert(0, os.path.abspath('../tests/autopilot/'))
368
20
369
21
#-- General configuration -----------------------------------------------------
370
22
371
23
#If your documentation needs a minimal Sphinx version, state it here.
372
24
#needs_sphinx = '1.0'
373
25
374
26
#Add any Sphinx extension module names here, as strings. They can be extensions
375
27
#coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
376
28
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
377
29
378
30
#Add any paths that contain templates here, relative to this directory.
379
31
templates_path = ['_templates']
380
32
381
33
#The suffix of source filenames.
382
34
source_suffix = '.rst'
383
35
384
36
#The encoding of source files.
385
37
#source_encoding = 'utf-8-sig'
386
38
387
39
#The master toctree document.
388
40
master_doc = 'index'
389
41
390
42
#General information about the project.
391
43
project = u'ubuntu-ui-toolkit-autopilot'
392
44
copyright = u'2013, Canonical'
393
45
394
46
#The version info for the project you're documenting, acts as replacement for
395
47
#|version| and |release|, also used in various other places throughout the
396
48
#built documents.
397
49
#
398
50
#The short X.Y version.
399
51
version = ''
400
52
#The full version, including alpha/beta/rc tags.
401
53
release = ''
402
54
403
55
#The language for content autogenerated by Sphinx. Refer to documentation
404
56
#for a list of supported languages.
405
57
#language = None
406
58
407
59
#There are two options for replacing |today|: either, you set today to some
408
60
#non-false value, then it is used:
409
61
#today = ''
410
62
#Else, today_fmt is used as the format for a strftime call.
411
63
#today_fmt = '%B %d, %Y'
412
64
413
65
#List of patterns, relative to source directory, that match files and
414
66
#directories to ignore when looking for source files.
415
67
exclude_patterns = ['_build']
416
68
417
69
#The reST default role (used for this markup: `text`) to use for all documents.
418
70
#default_role = None
419
71
420
72
#If true, '()' will be appended to :func: etc. cross-reference text.
421
73
#add_function_parentheses = True
422
74
423
75
#If true, the current module name will be prepended to all description
424
76
#unit titles (such as .. function::).
425
77
#add_module_names = True
426
78
427
79
#If true, sectionauthor and moduleauthor directives will be shown in the
428
80
#output. They are ignored by default.
429
81
#show_authors = False
430
82
431
83
#The name of the Pygments (syntax highlighting) style to use.
432
84
pygments_style = 'sphinx'
433
85
434
86
#A list of ignored prefixes for module index sorting.
435
87
#modindex_common_prefix = []
436
88
437
89
438
90
#-- Options for HTML output ---------------------------------------------------
439
91
440
92
#The theme to use for HTML and HTML Help pages.  See the documentation for
441
93
#a list of builtin themes.
442
94
html_theme = 'nature'
443
95
444
96
#Theme options are theme-specific and customize the look and feel of a theme
445
97
#further.  For a list of options available for each theme, see the
446
98
#documentation.
447
99
#html_theme_options = {}
448
100
449
101
#Add any paths that contain custom themes here, relative to this directory.
450
102
#html_theme_path = []
451
103
452
104
#The name for this set of Sphinx documents.  If None, it defaults to
453
105
#"<project> v<release> documentation".
454
106
#html_title = None
455
107
456
108
#A shorter title for the navigation bar.  Default is the same as html_title.
457
109
#html_short_title = None
458
110
459
111
#The name of an image file (relative to this directory) to place at the top
460
112
#of the sidebar.
461
113
#html_logo = None
462
114
463
115
#The name of an image file (within the static path) to use as favicon of the
464
116
#docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
465
117
#pixels large.
466
118
html_favicon = 'favicon.ico'
467
119
468
120
#Add any paths that contain custom static files (such as style sheets) here,
469
121
#relative to this directory. They are copied after the builtin static files,
470
122
#so a file named "default.css" will overwrite the builtin "default.css".
471
123
html_static_path = ['_static']
472
124
473
125
#If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
474
126
#using the given strftime format.
475
127
#html_last_updated_fmt = '%b %d, %Y'
476
128
477
129
#If true, SmartyPants will be used to convert quotes and dashes to
478
130
#typographically correct entities.
479
131
#html_use_smartypants = True
480
132
481
133
#Custom sidebar templates, maps document names to template names.
482
134
#html_sidebars = {}
483
135
484
136
#Additional templates that should be rendered to pages, maps page names to
485
137
#template names.
486
138
#html_additional_pages = {}
487
139
488
140
#If false, no module index is generated.
489
141
html_domain_indices = True
490
142
491
143
#If false, no index is generated.
492
144
html_use_index = True
493
145
494
146
#If true, the index is split into individual pages for each letter.
495
147
#html_split_index = False
496
148
497
149
#If true, links to the reST sources are added to the pages.
498
150
html_show_sourcelink = False
499
151
500
152
#If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
501
153
html_show_sphinx = False
502
154
503
155
#If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
504
156
html_show_copyright = True
505
157
506
158
#If true, an OpenSearch description file will be output, and all pages will
507
159
#contain a <link> tag referring to it.  The value of this option must be the
508
160
#base URL from which the finished HTML is served.
509
161
#html_use_opensearch = ''
510
162
511
163
#This is the file name suffix for HTML files (e.g. ".xhtml").
512
164
html_file_suffix = '.html'
513
165
514
166
#Output file base name for HTML help builder.
515
167
htmlhelp_basename = 'ubuntu-ui-toolkit-autopilotdoc'
516
168
517
169
518
170
#-- Options for LaTeX output --------------------------------------------------
519
171
520
172
latex_elements = {
521
173
#The paper size ('letterpaper' or 'a4paper').
522
174
#'papersize': 'letterpaper',
523
175
524
176
#The font size ('10pt', '11pt' or '12pt').
525
177
#'pointsize': '10pt',
526
178
527
179
#Additional stuff for the LaTeX preamble.
528
180
#'preamble': '',
529
181
}
530
182
531
183
#Grouping the document tree into LaTeX files. List of tuples
532
184
#(source start file, target name, title, author, documentclass [howto/manual]).
533
185
latex_documents = [
534
186
  ('index', 'ubuntu-ui-toolkit-autopilot.tex', u'ubuntu-ui-toolkit-autopilot Documentation',
535
187
   u'authors', 'manual'),
536
188
]
537
189
538
190
#The name of an image file (relative to this directory) to place at the top of
539
191
#the title page.
540
192
#latex_logo = None
541
193
542
194
#For "manual" documents, if this is true, then toplevel headings are parts,
543
195
#not chapters.
544
196
#latex_use_parts = False
545
197
546
198
#If true, show page references after internal links.
547
199
#latex_show_pagerefs = False
548
200
549
201
#If true, show URL addresses after external links.
550
202
#latex_show_urls = False
551
203
552
204
#Documents to append as an appendix to all manuals.
553
205
#latex_appendices = []
554
206
555
207
#If false, no module index is generated.
556
208
#latex_domain_indices = True
557
209
558
210
559
211
#-- Options for manual page output --------------------------------------------
560
212
561
213
#One entry per manual page. List of tuples
562
214
#(source start file, name, description, authors, manual section).
563
215
man_pages = [
564
216
    ('index', 'ubuntu-ui-toolkit-autopilot', u'ubuntu-ui-toolkit-autopilot Documentation',
565
217
     [u'authors'], 1)
566
218
]
567
219
568
220
#If true, show URL addresses after external links.
569
221
#man_show_urls = False
570
222
571
223
572
224
#-- Options for Texinfo output ------------------------------------------------
573
225
574
226
#Grouping the document tree into Texinfo files. List of tuples
575
227
#(source start file, target name, title, author,
576
228
# dir menu entry, description, category)
577
229
texinfo_documents = [
578
230
  ('index', 'ubuntu-ui-toolkit-autopilot', u'ubuntu-ui-toolkit-autopilot Documentation',
579
231
   u'authors', 'ubuntu-ui-toolkit-autopilot', 'An autopilot emulator for the ubuntu sdk',
580
232
   'Miscellaneous'),
581
233
]
582
234
583
235
#Documents to append as an appendix to all manuals.
584
236
#texinfo_appendices = []
585
237
586
238
#If false, no module index is generated.
587
239
#texinfo_domain_indices = True
588
240
589
241
#How to display URL addresses: 'footnote', 'no', or 'inline'.
590
242
#texinfo_show_urls = 'footnote'
591
243
592
244
593
245
#-- Options for Epub output ---------------------------------------------------
594
246
595
247
#Bibliographic Dublin Core info.
596
248
epub_title = u'ubuntu-ui-toolkit-autopilot'
597
249
epub_author = u'authors'
598
250
epub_publisher = u'Canonical'
599
251
epub_copyright = u'2013, Canonical'
600
252
601
253
#The language of the text. It defaults to the language option
602
254
#or en if the language is not set.
603
255
#epub_language = ''
604
256
605
257
#The scheme of the identifier. Typical schemes are ISBN or URL.
606
258
#epub_scheme = ''
607
259
608
260
#The unique identifier of the text. This can be a ISBN number
609
261
#or the project homepage.
610
262
#epub_identifier = ''
611
263
612
264
#A unique identification for the text.
613
265
#epub_uid = ''
614
266
615
267
#A tuple containing the cover image and cover page html template filenames.
616
268
#epub_cover = ()
617
269
618
270
#HTML files that should be inserted before the pages created by sphinx.
619
271
#The format is a list of tuples containing the path and title.
620
272
#epub_pre_files = []
621
273
622
274
#HTML files shat should be inserted after the pages created by sphinx.
623
275
#The format is a list of tuples containing the path and title.
624
276
#epub_post_files = []
625
277
626
278
#A list of files that should not be packed into the epub file.
627
279
#epub_exclude_files = []
628
280
629
281
#The depth of the table of contents in toc.ncx.
630
282
#epub_tocdepth = 3
631
283
632
284
#Allow duplicate toc entries.
633
285
#epub_tocdup = True
634
0
286
635
=== added file 'docs-autopilot-emulator/index.rst'
636
--- docs-autopilot-emulator/index.rst	1970-01-01 00:00:00 +0000
637
+++ docs-autopilot-emulator/index.rst	2013-12-17 19:57:06 +0000
638
@@ -0,0 +1,23 @@
639
1
.. ubuntu-ui-toolkit-autopilot documentation master file, created by
640
2
   sphinx-quickstart on Fri Jul 26 12:12:45 2013.
641
3
   You can adapt this file completely to your liking, but it should at least
642
4
   contain the root `toctree` directive.
643
5
644
6
Welcome to ubuntu-ui-toolkit-autopilot's documentation!
645
7
=======================================================
646
8
647
9
Contents:
648
10
649
11
.. toctree::
650
12
   :maxdepth: 4
651
13
652
14
   ubuntuuitoolkit
653
15
654
16
655
17
Indices and tables
656
18
==================
657
19
658
20
* :ref:`genindex`
659
21
* :ref:`modindex`
660
22
* :ref:`search`
661
23
662
0
24
663
=== added file 'docs-autopilot-emulator/ubuntuuitoolkit.rst'
664
--- docs-autopilot-emulator/ubuntuuitoolkit.rst	1970-01-01 00:00:00 +0000
665
+++ docs-autopilot-emulator/ubuntuuitoolkit.rst	2013-12-17 19:57:06 +0000
666
@@ -0,0 +1,10 @@
667
1
ubuntuuitoolkit Package
668
2
=======================
669
3
670
4
:mod:`emulators` Module
671
5
-----------------------
672
6
673
7
.. automodule:: ubuntuuitoolkit.emulators
674
8
    :members:
675
9
    :undoc-members:
676
10
    :show-inheritance:
677
0
11
678
=== added directory 'documentation'
679
=== renamed directory 'documentation' => 'documentation.moved'
680
=== renamed file 'documentation/all-modules.qdoc' => 'documentation/all-modules.qdoc'
681
=== renamed directory 'documentation/css' => 'documentation/css'
682
=== renamed file 'documentation/docs.sh' => 'documentation/docs.sh'
683
=== renamed file 'documentation/documentation.pri' => 'documentation/documentation.pri'
684
=== removed directory 'documentation/html'
685
=== renamed directory 'documentation/images' => 'documentation/images'
686
=== renamed file 'documentation/overview.qdoc' => 'documentation/overview.qdoc'
687
=== renamed file 'documentation/resolution-independence.qdoc' => 'documentation/resolution-independence.qdoc'
688
=== renamed directory 'documentation/snippets' => 'documentation/snippets'
689
=== renamed file 'documentation/statesaving.qdoc' => 'documentation/statesaving.qdoc'
690
=== renamed file 'documentation/ubuntu-appdev-site-footer.qdocconf' => 'documentation/ubuntu-appdev-site-footer.qdocconf'
691
=== renamed file 'documentation/ubuntu-appdev-site-header.qdocconf' => 'documentation/ubuntu-appdev-site-header.qdocconf'
692
=== renamed file 'documentation/ubuntu-components-listitems.qdoc' => 'documentation/ubuntu-components-listitems.qdoc'
693
=== renamed file 'documentation/ubuntu-components-pickers.qdoc' => 'documentation/ubuntu-components-pickers.qdoc'
694
=== renamed file 'documentation/ubuntu-components-popups.qdoc' => 'documentation/ubuntu-components-popups.qdoc'
695
=== renamed file 'documentation/ubuntu-components.qdoc' => 'documentation/ubuntu-components.qdoc'
696
=== renamed file 'documentation/ubuntu-layouts.qdoc' => 'documentation/ubuntu-layouts.qdoc'
697
=== renamed file 'documentation/ubuntu-ui-toolkit-common.qdocconf' => 'documentation/ubuntu-ui-toolkit-common.qdocconf'
698
=== renamed file 'documentation/ubuntu-ui-toolkit-offline.qdocconf' => 'documentation/ubuntu-ui-toolkit-offline.qdocconf'
699
=== renamed file 'documentation/ubuntu-ui-toolkit-online.qdocconf' => 'documentation/ubuntu-ui-toolkit-online.qdocconf'
700
=== renamed file 'documentation/ubuntu-ui-toolkit-qtcreator.qdocconf' => 'documentation/ubuntu-ui-toolkit-qtcreator.qdocconf'
Status:	Superseded
Proposed branch:	lp:~nskaggs/ubuntu-ui-toolkit/emulator-docs-try2
Merge into:	lp:ubuntu-ui-toolkit
Diff against target:	700 lines (+591/-5) (has conflicts) 9 files modified README (+22/-2) debian/changelog (+6/-0) debian/control (+3/-2) debian/rules (+3/-1) docs-autopilot-emulator/_static/nature.css (+211/-0) docs-autopilot-emulator/_templates/layout.html (+28/-0) docs-autopilot-emulator/conf.py (+285/-0) docs-autopilot-emulator/index.rst (+23/-0) docs-autopilot-emulator/ubuntuuitoolkit.rst (+10/-0) Conflict: can't delete documentation.moved because it is not empty. Not deleting. Conflict adding file documentation. Moved existing file to documentation.moved. Conflict because documentation.moved is not versioned, but has versioned children. Versioned directory.
To merge this branch:	bzr merge lp:~nskaggs/ubuntu-ui-toolkit/emulator-docs-try2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2013-12-17
Cris Dywan		2013-10-29	Needs Fixing on 2013-11-27
Review via email: mp+193132@code.launchpad.net