Merge lp:~didrocks/ubuntu-ui-toolkit/unblock-proposed into lp:ubuntu-ui-toolkit

[Didier Roche-Tolomelli]

remove the doc generation for UITK autopilot emulator. Autopilot is in universe for now, it needs MIRing first

remove the doc generation for UITK autopilot emulator. Autopilot is in universe for now, it needs MIRing first

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:972
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1896/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3955
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/844
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3990
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3990/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3542
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3542/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5875
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4827

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1896/rebuild

review: Approve (continuous-integration)

=== modified file 'README'
--- README	2013-12-17 20:31:40 +0000
+++ README	2014-03-17 08:54:28 +0000
@@ -47,26 +47,6 @@
 Documentation
 -------------
 
-Main Documentation (QDocs):
-+++++++++++++++++++++++++++
-
 Once built, you may view the documentation by opening  
-`documentation/html/overview-ubuntu-sdk.html` in your favorite web browser.
-
-
-Autopilot Emulators (Sphinx docs):
-++++++++++++++++++++++++++++++++++
-
-To build the AutoPilot Emulators API documentation (html),
-  
-  * install python-sphinx::
-
-        $ sudo apt-get install python-sphinx
-    
-  * from the branch's root, run::
-
-        $ sphinx-build -b html docs-autopilot-emulator emulator-html
-
-  * Once built, you may view the documentation by opening
-    `emulator-html/ubuntuuitoolkit.html` in your favorite web browser.
-
+  documentation/html/overview-ubuntu-sdk.html
+in your favorite web browser.

=== modified file 'debian/control'
--- debian/control	2014-03-07 18:37:32 +0000
+++ debian/control	2014-03-17 08:54:28 +0000
@@ -39,8 +39,6 @@
                xvfb,
                libgl1-mesa-dri,
                locales,
-               python-sphinx,
-               python-autopilot (>= 1.4),
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-ui-toolkit
 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging

=== modified file 'debian/rules'
--- debian/rules	2014-03-03 08:37:42 +0000
+++ debian/rules	2014-03-17 08:54:28 +0000
@@ -20,8 +20,6 @@
 	dh_auto_build -- docs
 
 override_dh_install:
-	dh_auto_build -- docs
-	sphinx-build -b html docs-autopilot-emulator docs-autopilot-emulator/_build/html
-	mkdir -p debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch
+	mkdir -p debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch 
 	dh_install --fail-missing
 

=== removed file 'debian/ubuntu-ui-toolkit-autopilot.docs'
--- debian/ubuntu-ui-toolkit-autopilot.docs	2014-02-05 17:01:34 +0000
+++ debian/ubuntu-ui-toolkit-autopilot.docs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-docs-autopilot-emulator/_build/html

=== removed directory 'docs-autopilot-emulator'
=== removed directory 'docs-autopilot-emulator/_static'
=== removed file 'docs-autopilot-emulator/_static/favicon.ico'
Binary files docs-autopilot-emulator/_static/favicon.ico	2013-12-17 20:31:40 +0000 and docs-autopilot-emulator/_static/favicon.ico	1970-01-01 00:00:00 +0000 differ
=== removed file 'docs-autopilot-emulator/_static/nature.css'
--- docs-autopilot-emulator/_static/nature.css	2013-12-17 20:31:40 +0000
+++ docs-autopilot-emulator/_static/nature.css	1970-01-01 00:00:00 +0000
@@ -1,211 +0,0 @@
-/*
-	Copyright 2013 Canonical Ltd.
-*/
- 
- @import url(basic.css);
-
-body {
-	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
-	font-size:100%;
-	background-color:#2C001E;
-	margin:0;
-	padding:0;
-	}
-
-div.documentwrapper {
-	float:left;
-	width:100%;
-}
-
-div.bodywrapper {
-	margin:0 0 0 0;
-}
-
-hr {
-	border:1px solid #B1B4B6;
-}
-
-div.body {
-	background-color:#FFF;
-	color:#3E4349;
-	font-size:.9em;
-	padding:0 30px 30px;
-}
-
-div.footer {
-	color:#CCC;
-	width:100%;
-	text-align:center;
-	font-size:75%;
-	padding:13px 0;
-}
-
-div.footer a {
-	color:#444;
-	text-decoration:underline;
-}
-
-div.related {
-	background-color:#DD4814;
-	line-height:32px;
-	color:#fff;
-	font-size:.9em;
-}
-
-div.related a {
-	color:#EEE;
-}
-
-div.sphinxsidebar {
-	font-size:.75em;
-	line-height:1.5em;
-}
-
-div.sphinxsidebarwrapper {
-	padding:20px 0;
-}
-
-div.sphinxsidebar h3,
-div.sphinxsidebar h4 {
-	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
-	color:#222;
-	font-size:1.2em;
-	font-weight:400;
-	background-color:#ddd;
-	margin:0;
-	padding:5px 10px;
-}
-
-div.sphinxsidebar p {
-	color:#444;
-	padding:2px 10px;
-}
-
-div.sphinxsidebar ul {
-	color:#000;
-	margin:10px 5px;
-	padding:0;
-}
-
-div.sphinxsidebar input {
-	border:1px solid #ccc;
-	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
-	font-size:1em;
-}
-
-div.sphinxsidebar input[type=text] {
-	margin-left:5px;
-}
-
-a {
-	color:#5E2750;
-	text-decoration:none;
-}
-
-a:hover {
-	color:#DD4814;
-	text-decoration:underline;
-}
-
-div.body h1 {
-	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
-	font-weight:bold;
-	font-size:200%;
-	color:#444;
-	margin:20px 0 10px;
-	padding:5px 0 5px 10px;
-}
-
-div.body h2 {
-	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
-	font-size:130%;
-	background-color:#CCC;
-	margin:20px 0 10px;
-	padding:5px 0 5px 10px;
-}
-
-div.body h6 {
-	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
-	background-color:#BED4EB;
-	font-weight:400;
-	color:#333;
-	margin:30px 0 10px;
-	padding:5px 0 5px 10px;
-}
-
-a.headerlink {
-	text-decoration:none;
-	padding:0 4px;
-}
-
-a.headerlink:hover {
-	background-color:#AEA79F;
-	color:#FFF;
-}
-
-div.body p,div.body dd,div.body li {
-	line-height:1.5em;
-}
-
-div.highlight {
-	background-color:#FFF;
-}
-
-div.note {
-	background-color:#eee;
-	border:1px solid #ccc;
-}
-
-div.seealso {
-	background-color:#ffc;
-	border:1px solid #ff6;
-}
-
-div.warning {
-	background-color:#ffe4e4;
-	border:1px solid #f66;
-}
-
-p.admonition-title:after {
-	content:":";
-}
-
-pre {
-	background-color:#EFEFEF;
-	color:#000;
-	line-height:1.1em;
-	border:1px solid #C6C9CB;
-	font-size:1.2em;
-	font-family:"Ubuntu Mono", Monaco, Consolas, "DejaVu Sans Mono", "Lucida Console", monospace;
-	margin:1.5em 0;
-	padding:6px;
-}
-
-tt {
-	background-color:#EFEFEF;
-	color:#222;
-	font-size:1.1em;
-	font-family:"Ubuntu Mono", Monaco, Consolas, "DejaVu Sans Mono", "Lucida Console", monospace;
-}
-
-.viewcode-back {
-	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
-}
-
-div.viewcode-block:target {
-	background-color:#f4debf;
-	border-top:1px solid #ac9;
-	border-bottom:1px solid #ac9;
-}
-
-div.document,div.topic {
- background-color:#eee;
-}
-
-div.sphinxsidebar h3 a,div.sphinxsidebar a {
- color:#444;
-}
-
-div.admonition p.admonition-title + p,p.admonition-title {
-	display:inline;
-}

=== removed directory 'docs-autopilot-emulator/_templates'
=== removed file 'docs-autopilot-emulator/_templates/layout.html'
--- docs-autopilot-emulator/_templates/layout.html	2013-12-17 20:31:40 +0000
+++ docs-autopilot-emulator/_templates/layout.html	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<!--
-    Copyright 2013 Canonical Ltd.
--->
-
-{#
-    default/layout.html
-    ~~~~~~~~~~~~~~~~~~~
-
-    Sphinx layout template for the default theme.
-
-    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{% extends "basic/layout.html" %}
-
-{%- block content %}
-<div class="document">
-  {%- block document %}
-      <div class="documentwrapper">
-      {%- if render_sidebar %}
-        <div class="bodywrapper">
-      {%- endif %}
-          <div class="body">
-            {% block body %} {% endblock %}
-          </div>
-      </div>
-  {%- endblock %}
-{%- endblock %}
\ No newline at end of file

=== removed file 'docs-autopilot-emulator/conf.py'
--- docs-autopilot-emulator/conf.py	2013-12-17 20:35:02 +0000
+++ docs-autopilot-emulator/conf.py	1970-01-01 00:00:00 +0000
@@ -1,290 +0,0 @@
-#-*- coding: utf-8 -*-
-#
-#ubuntu-ui-toolkit-autopilot documentation build configuration file, created by
-#sphinx-quickstart on Fri Jul 26 12:12:45 2013.
-#
-#This file is execfile()d with the current directory set to its containing dir.
-#
-#Note that not all possible configuration values are present in this
-#autogenerated file.
-#
-#All configuration values have a default; values that are commented out
-#serve to show the default.
-
-import sys
-import os
-
-#If extensions (or modules to document with autodoc) are in another directory,
-#add these directories to sys.path here. If the directory is relative to the
-#documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('../tests/autopilot/'))
-
-#-- General configuration -----------------------------------------------------
-
-#If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-#Add any Sphinx extension module names here, as strings. They can be extensions
-#coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
-
-#Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-#The suffix of source filenames.
-source_suffix = '.rst'
-
-#The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-#The master toctree document.
-master_doc = 'index'
-
-#General information about the project.
-project = u'ubuntu-ui-toolkit-autopilot'
-copyright = u'2013, Canonical'
-
-#The version info for the project you're documenting, acts as replacement for
-#|version| and |release|, also used in various other places throughout the
-#built documents.
-#
-#The short X.Y version.
-version = ''
-#The full version, including alpha/beta/rc tags.
-release = ''
-
-#The language for content autogenerated by Sphinx. Refer to documentation
-#for a list of supported languages.
-#language = None
-
-#There are two options for replacing |today|: either, you set today to some
-#non-false value, then it is used:
-#today = ''
-#Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-#List of patterns, relative to source directory, that match files and
-#directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-#The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-#If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-#If true, the current module name will be prepended to all description
-#unit titles (such as .. function::).
-#add_module_names = True
-
-#If true, sectionauthor and moduleauthor directives will be shown in the
-#output. They are ignored by default.
-#show_authors = False
-
-#The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-#A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-#-- Options for HTML output ---------------------------------------------------
-
-#The theme to use for HTML and HTML Help pages.  See the documentation for
-#a list of builtin themes.
-html_theme = 'nature'
-
-#Theme options are theme-specific and customize the look and feel of a theme
-#further.  For a list of options available for each theme, see the
-#documentation.
-#html_theme_options = {}
-
-#Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-#The name for this set of Sphinx documents.  If None, it defaults to
-#"<project> v<release> documentation".
-#html_title = None
-
-#A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-#The name of an image file (relative to this directory) to place at the top
-#of the sidebar.
-#html_logo = None
-
-#The name of an image file (within the static path) to use as favicon of the
-#docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-#pixels large.
-html_favicon = 'favicon.ico'
-
-#Add any paths that contain custom static files (such as style sheets) here,
-#relative to this directory. They are copied after the builtin static files,
-#so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-#If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-#using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-#If true, SmartyPants will be used to convert quotes and dashes to
-#typographically correct entities.
-#html_use_smartypants = True
-
-#Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-#Additional templates that should be rendered to pages, maps page names to
-#template names.
-#html_additional_pages = {}
-
-#If false, no module index is generated.
-html_domain_indices = True
-
-#If false, no index is generated.
-html_use_index = True
-
-#If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-#If true, links to the reST sources are added to the pages.
-html_show_sourcelink = False
-
-#If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-html_show_sphinx = False
-
-#If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-html_show_copyright = True
-
-#If true, an OpenSearch description file will be output, and all pages will
-#contain a <link> tag referring to it.  The value of this option must be the
-#base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-#This is the file name suffix for HTML files (e.g. ".xhtml").
-html_file_suffix = '.html'
-
-#Output file base name for HTML help builder.
-htmlhelp_basename = 'ubuntu-ui-toolkit-autopilotdoc'
-
-
-#-- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-    #The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-
-    #The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-
-    #Additional stuff for the LaTeX preamble.
-    #'preamble': '',
-}
-
-#Grouping the document tree into LaTeX files. List of tuples
-#(source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-    ('index', 'ubuntu-ui-toolkit-autopilot.tex',
-     u'ubuntu-ui-toolkit-autopilot Documentation',
-     u'authors', 'manual'),
-]
-
-#The name of an image file (relative to this directory) to place at the top of
-#the title page.
-#latex_logo = None
-
-#For "manual" documents, if this is true, then toplevel headings are parts,
-#not chapters.
-#latex_use_parts = False
-
-#If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-#If true, show URL addresses after external links.
-#latex_show_urls = False
-
-#Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-#If false, no module index is generated.
-#latex_domain_indices = True
-
-
-#-- Options for manual page output --------------------------------------------
-
-#One entry per manual page. List of tuples
-#(source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'ubuntu-ui-toolkit-autopilot',
-     u'ubuntu-ui-toolkit-autopilot Documentation',
-     [u'authors'], 1)
-]
-
-#If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-#-- Options for Texinfo output ------------------------------------------------
-
-#Grouping the document tree into Texinfo files. List of tuples
-#(source start file, target name, title, author,
-# dir menu entry, description, category)
-texinfo_documents = [
-    ('index', 'ubuntu-ui-toolkit-autopilot',
-     u'ubuntu-ui-toolkit-autopilot Documentation',
-     u'authors', 'ubuntu-ui-toolkit-autopilot',
-     'An autopilot emulator for the ubuntu sdk',
-     'Miscellaneous'),
-]
-
-#Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-#If false, no module index is generated.
-#texinfo_domain_indices = True
-
-#How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-
-#-- Options for Epub output ---------------------------------------------------
-
-#Bibliographic Dublin Core info.
-epub_title = u'ubuntu-ui-toolkit-autopilot'
-epub_author = u'authors'
-epub_publisher = u'Canonical'
-epub_copyright = u'2013, Canonical'
-
-#The language of the text. It defaults to the language option
-#or en if the language is not set.
-#epub_language = ''
-
-#The scheme of the identifier. Typical schemes are ISBN or URL.
-#epub_scheme = ''
-
-#The unique identifier of the text. This can be a ISBN number
-#or the project homepage.
-#epub_identifier = ''
-
-#A unique identification for the text.
-#epub_uid = ''
-
-#A tuple containing the cover image and cover page html template filenames.
-#epub_cover = ()
-
-#HTML files that should be inserted before the pages created by sphinx.
-#The format is a list of tuples containing the path and title.
-#epub_pre_files = []
-
-#HTML files shat should be inserted after the pages created by sphinx.
-#The format is a list of tuples containing the path and title.
-#epub_post_files = []
-
-#A list of files that should not be packed into the epub file.
-#epub_exclude_files = []
-
-#The depth of the table of contents in toc.ncx.
-#epub_tocdepth = 3
-
-#Allow duplicate toc entries.
-#epub_tocdup = True

=== removed file 'docs-autopilot-emulator/index.rst'
--- docs-autopilot-emulator/index.rst	2013-12-17 20:31:40 +0000
+++ docs-autopilot-emulator/index.rst	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-.. ubuntu-ui-toolkit-autopilot documentation master file, created by
-   sphinx-quickstart on Fri Jul 26 12:12:45 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to ubuntu-ui-toolkit-autopilot's documentation!
-=======================================================
-
-Contents:
-
-.. toctree::
-   :maxdepth: 4
-
-   ubuntuuitoolkit
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-

=== removed file 'docs-autopilot-emulator/ubuntuuitoolkit.rst'
--- docs-autopilot-emulator/ubuntuuitoolkit.rst	2013-12-17 20:31:40 +0000
+++ docs-autopilot-emulator/ubuntuuitoolkit.rst	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-ubuntuuitoolkit Package
-=======================
-
-:mod:`emulators` Module
------------------------
-
-.. automodule:: ubuntuuitoolkit.emulators
-    :members:
-    :undoc-members:
-    :show-inheritance: