Merge lp:~unity-team/unity/unity8-packaging-cleanup into lp:unity/8.0

[Didier Roche-Tolomelli]

Packaging cleanup for unity 8:
- install arch-deps binary libraries in a private lib directory
- cleanup debian/control, rules, and install
- complete debian/copyright
- ship missing license files
- install the python (autopilot) part using a setup.py
- consolidate mocks
- drop qml-phone-shell transitional packages and references

Packaging cleanup for unity 8:
- install arch-deps binary libraries in a private lib directory
- cleanup debian/control, rules, and install
- complete debian/copyright
- ship missing license files
- install the python (autopilot) part using a setup.py

[Didier Roche-Tolomelli (didrocks)]

setting as WIP as Saviq needs to do some upstream changes

[lp:~unity-team/unity/unity8-packaging-cleanup]

65. By Michael Zanetti on 2013-06-27

dropped qml-phone-shell from run_on_device too

66. By Michael Zanetti on 2013-06-27

removed unused include

67. By Michael Zanetti on 2013-06-27

revert dependency change for qtubuntu

68. By Michael Zanetti on 2013-06-27

merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/227/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/225/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/230/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/432/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/227/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity/unity8-packaging-cleanup]

69. By Michael Zanetti on 2013-06-28

fix license header for setup.py

70. By Michael Zanetti on 2013-06-28

merge

71. By Michael Zanetti on 2013-06-28

merge more

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/232/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/448/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/230/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/244/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/450/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/232/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/233/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/450/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/231
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/232
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/245/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/452
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/452/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/411/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/233/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/235/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/233
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/234
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/247/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/454
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/454/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/413

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/235/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/237/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/235
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/235/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/236
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/249/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/456
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/456/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/415

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/237/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity/unity8-packaging-cleanup]

72. By Michael Zanetti on 2013-06-28

remove autopilot import path settings. they should be found by the binary itself now

73. By Michael Zanetti on 2013-06-28

merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/238/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/236
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/237
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/250/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/457
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/457/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/416

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/238/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/240/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/238
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/239
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/252/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/459
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/459/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/417

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/240/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity/unity8-packaging-cleanup]

74. By Michał Sawicz on 2013-06-28

fix tst_ScopeView import paths

75. By Michał Sawicz on 2013-06-28

When installed, we should only use fallbacks, not override anything system-wide.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/241/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/239
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/240
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/463
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/463/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/421

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/241/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity/unity8-packaging-cleanup]

76. By Michał Sawicz on 2013-06-28

Fix Notifications import paths.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:75
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/242/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/240
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/241
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/257/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/468
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/468/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/426

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/242/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity/unity8-packaging-cleanup]

77. By Didier Roche-Tolomelli on 2013-06-28

recommends phone scopes for now generated from libunity-scopes-json-def-phone

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/243/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/472
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/241/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/242
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/261/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/474
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/474/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/431

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/243/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/244/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/474/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/243/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/263/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/476/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/244/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/251/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/518/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/250/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/298/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/520/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/251/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

77. By Didier Roche-Tolomelli on 2013-06-28

recommends phone scopes for now generated from libunity-scopes-json-def-phone

76. By Michał Sawicz on 2013-06-28

Fix Notifications import paths.

75. By Michał Sawicz on 2013-06-28

When installed, we should only use fallbacks, not override anything system-wide.

74. By Michał Sawicz on 2013-06-28

fix tst_ScopeView import paths

73. By Michael Zanetti on 2013-06-28

merge

72. By Michael Zanetti on 2013-06-28

remove autopilot import path settings. they should be found by the binary itself now

71. By Michael Zanetti on 2013-06-28

merge more

70. By Michael Zanetti on 2013-06-28

merge

69. By Michael Zanetti on 2013-06-28

fix license header for setup.py

68. By Michael Zanetti on 2013-06-27

merge

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -57,6 +57,7 @@
 include(GNUInstallDirs)
 
 set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
+set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
 
 configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
 

=== added file 'COPYING.LGPL'
--- COPYING.LGPL	1970-01-01 00:00:00 +0000
+++ COPYING.LGPL	2013-06-28 14:53:52 +0000
@@ -0,0 +1,514 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+
+ The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ Contact: http://www.qt-project.org/legal
+
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU Lesser General Public License version 2.1, which is displayed below.
+
+-------------------------------------------------------------------------
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+

+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+

+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+

+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+

+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+

+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+

+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+

+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+

+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+

+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+

=== added file 'LGPL_EXCEPTION.txt'
--- LGPL_EXCEPTION.txt	1970-01-01 00:00:00 +0000
+++ LGPL_EXCEPTION.txt	2013-06-28 14:53:52 +0000
@@ -0,0 +1,22 @@
+Digia Qt LGPL Exception version 1.1
+
+As an additional permission to the GNU Lesser General Public License version
+2.1, the object code form of a "work that uses the Library" may incorporate
+material from a header file that is part of the Library.  You may distribute
+such object code under terms of your choice, provided that:
+    (i)   the header files of the Library have not been modified; and 
+    (ii)  the incorporated material is limited to numerical parameters, data
+          structure layouts, accessors, macros, inline functions and
+          templates; and
+    (iii) you comply with the terms of Section 6 of the GNU Lesser General
+          Public License version 2.1.
+
+Moreover, you may apply this exception to a modified version of the Library,
+provided that such modification does not involve copying material from the
+Library into the modified Library's header files unless such material is
+limited to (i) numerical parameters; (ii) data structure layouts;
+(iii) accessors; and (iv) small macros, templates and inline functions of
+five lines or less in length.
+
+Furthermore, you are not required to apply this additional permission to a
+modified version of the Library.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-26 16:11:31 +0000
+++ debian/changelog	2013-06-28 14:53:52 +0000
@@ -1,3 +1,10 @@
+unity8 (7.81.3-0ubuntu1) UNRELEASED; urgency=low
+
+  * Clean packaging for entering saucy and following daily release guidelines
+  * Automatic snapshot from revision 49 (bootstrap)
+
+ -- Didier Roche <[e-mail]>  Wed, 26 Jun 2013 11:01:09 +0200
+
 unity8 (7.81.2) saucy; urgency=low
 
   * Translation updates.

=== modified file 'debian/control'
--- debian/control	2013-06-20 00:01:16 +0000
+++ debian/control	2013-06-28 14:53:52 +0000
@@ -1,10 +1,9 @@
 Source: unity8
 Section: x11
-Priority: extra
+Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
-               libc6-dev,
                libdee-qt5-dev (>= 3.0),
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                libgl1-mesa-dri,
@@ -15,6 +14,8 @@
                libxcb1-dev,
                pkg-config,
                python3,
+               python (>= 2.7),
+               python-setuptools,
                qt5-default,
                qtbase5-dev,
                qtbase5-private-dev,
@@ -25,75 +26,69 @@
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
                qtdeclarative5-xmllistmodel-plugin,
                ttf-ubuntu-font-family,
-Standards-Version: 3.9.3
+               libunity-scopes-json-def-phone,
+Standards-Version: 3.9.4
 Homepage: http://launchpad.net/unity
 # If you aren't a member of ~unity-team but need to upload
 # packaging changes, just go ahead. ~unity-team will notice
 # and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~unity-team/unity/phablet
-Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity/phablet/files
+Vcs-Bzr: https://code.launchpad.net/~unity-team/unity/8.0
+Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity/phablet/8.0
 
 Package: unity8
-Replaces: qml-phone-shell (<< 7.80~)
-Breaks: qml-phone-shell (<< 7.80~)
-Architecture: amd64 armhf i386
-Depends: indicators-client (>= 0.6.1),
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         unity8-private (= ${binary:Version}),
+         indicators-client (>= 0.6.1),
          qtdeclarative5-dee-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
          unity-notifications-impl-1,
          qtdeclarative5-xmllistmodel-plugin,
-         qtubuntu,
-         ${misc:Depends},
-         ${shlibs:Depends},
-Recommends: indicators-client-plugin-datetime (>= 0.6.1),
+         unity8-fake-env | qtubuntu-shell,
+Recommends: ${unity-default-masterscopes},
+            indicators-client-plugin-datetime (>= 0.6.1),
             indicators-client-plugin-messaging (>= 0.6.1),
             indicators-client-plugin-network (>= 0.6.1),
             indicators-client-plugin-power (>= 0.6.1),
             indicators-client-plugin-sound (>= 0.6.1),
-            unity-scope-home,
-            unity-lens-applications,
-Description: Ubuntu QML shell
- The Ubuntu QML shell is the primary user interface for Ubuntu devices.
+Description: Unity 8 shell
+ The Unity 8 shell is the primary user interface for Ubuntu devices.
 
-Package: qml-phone-shell
-Depends: unity8, ${misc:Depends}
-Architecture: all
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Package: unity8-private
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Unity 8 private libs
+ The Unity 8 shell is the primary user interface for Ubuntu devices.
+ .
+ This package contains the private libraries for QML and other components
+ only used by the shell.
 
 Package: unity8-fake-env
-Replaces: qml-phone-shell-fake-env (<< 7.80~)
-Breaks: qml-phone-shell-fake-env (<< 7.80~)
-Architecture: amd64 armhf i386
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Fake environment for running Ubuntu QML shell
- Provides fake implementations of some QML modules used by Ubuntu QML shell
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Provides: qtubuntu-shell,
+Description: Fake environment for running Unity 8 shell
+ Provides fake implementations of some QML modules used by Unity 8 shell
  (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
 
-Package: qml-phone-shell-fake-env
-Depends: unity8-fake-env, ${misc:Depends}
-Architecture: all
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
 Package: unity8-autopilot
-Replaces: qml-phone-shell-autopilot (<< 7.80~)
-Breaks: qml-phone-shell-autopilot (<< 7.80~)
 Architecture: all
-Depends: libautopilot-qt,
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${python:Depends},
+         libautopilot-qt,
          libqt5test5,
          libqt5widgets5,
          python-evdev,
-         unity8 (= ${source:Version}),
-         unity8-fake-env (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Test package for the shell
+         unity8 (>= ${source:Version}),
+         unity8-fake-env (>= ${source:Version}),
+Description: Test package for Unity 8 shell
  Autopilot tests for the unity8 package
-
-Package: qml-phone-shell-autopilot
-Depends: unity8-autopilot, ${misc:Depends}
-Architecture: all
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.

=== modified file 'debian/copyright'
--- debian/copyright	2013-06-05 22:03:08 +0000
+++ debian/copyright	2013-06-28 14:53:52 +0000
@@ -1,7 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: unity8
+Source: http://launchpad.net/unity
 
 Files: *
-Copyright: 2013 Canonical Ltd.
+Copyright: 2011-2013 Canonical Ltd.
 License: GPL-3
 
 License: GPL-3
@@ -20,9 +22,17 @@
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file /usr/share/common-licenses/GPL-3.
 
-Files: tests/unittests/plugins/Utils/modeltest.*
+Files: tests/mocks/LightDM/UsersModel.h tests/mocks/LightDM/Greeter.h
+Copyright: 2013 Canonical Ltd.
+           2010-2011 David Edmundson
+           2010-2011 Robert Ancell
+License: GPL-3
+
+Files: plugins/Utils/qvariantlistmodel.*
+       tests/unittests/plugins/Utils/modeltest.*
+       tests/plugins/Utils/modeltest.*
 Copyright: 2013 Digia Plc and/or its subsidiary(-ies).
-License:
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
  Commercial License Usage
  Licensees holding valid commercial Qt licenses may use this file in
  accordance with the commercial license agreement provided with the

=== modified file 'debian/rules'
--- debian/rules	2013-06-20 13:42:39 +0000
+++ debian/rules	2013-06-28 14:53:52 +0000
@@ -6,11 +6,27 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 export NO_PNG_PKG_MANGLE=1
 
+SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json)
+
 %:
-	dh $@ --parallel
+	dh $@ --parallel --fail-missing --with python2
 
 override_dh_install:
-	dh_install --fail-missing
-
+	# install autopilot tests
+	cd tests/autopilot; \
+	set -ex; for python in $(shell pyversions -r); do \
+	    $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+	done; \
+	cd $(CURDIR)
+	dh_install -X'*.pyc' --fail-missing
+
+# use private lib directories
+override_dh_makeshlibs:
+	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
+
+# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
 override_dh_shlibdeps:
 	dh_shlibdeps -XlibMockLightDM-qml.so
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Vunity-default-masterscopes="$(SCOPES_RECOMMENDS)"

=== added file 'debian/scopes-recommends-generator'
--- debian/scopes-recommends-generator	1970-01-01 00:00:00 +0000
+++ debian/scopes-recommends-generator	2013-06-28 14:53:52 +0000
@@ -0,0 +1,27 @@
+#!/usr/bin/perl -w
+
+use strict;
+binmode STDOUT, ":utf8";
+use utf8;
+
+use JSON;
+
+my $json;
+{
+  local $/; #Enable 'slurp' mode
+  open my $fh, "<", $ARGV[0];
+  $json = <$fh>;
+  close $fh;
+}
+# get it to a scalar
+my $j = "[" . $json . "]";
+
+my $decoded_json = decode_json( $j );
+
+my $recommends_list = "";
+for my $record ( @$decoded_json ) {
+  foreach my $key ( keys(%$record) ) {
+    $recommends_list = $recommends_list . $key . ", ";
+  }
+}
+print $recommends_list;

=== modified file 'debian/unity8-autopilot.install'
--- debian/unity8-autopilot.install	2013-06-05 22:03:08 +0000
+++ debian/unity8-autopilot.install	2013-06-28 14:53:52 +0000
@@ -1,1 +1,1 @@
-tests/autopilot/unity8/* usr/lib/python2.7/dist-packages/unity8/
+usr/lib/python*/*/unity*

=== modified file 'debian/unity8-fake-env.install'
--- debian/unity8-fake-env.install	2013-06-05 22:03:08 +0000
+++ debian/unity8-fake-env.install	2013-06-28 14:53:52 +0000
@@ -1,1 +1,1 @@
-/usr/share/unity8/plugins/mocks/*
+usr/lib/*/unity8/qml/mocks

=== added file 'debian/unity8-private.install'
--- debian/unity8-private.install	1970-01-01 00:00:00 +0000
+++ debian/unity8-private.install	2013-06-28 14:53:52 +0000
@@ -0,0 +1,5 @@
+usr/lib/*/unity8/qml/HudClient
+usr/lib/*/unity8/qml/LightDM
+usr/lib/*/unity8/qml/Ubuntu
+usr/lib/*/unity8/qml/Unity
+usr/lib/*/unity8/qml/Utils

=== modified file 'debian/unity8.install'
--- debian/unity8.install	2013-06-05 22:03:08 +0000
+++ debian/unity8.install	2013-06-28 14:53:52 +0000
@@ -1,20 +1,15 @@
-/usr/bin/unity8
-/usr/share/applications/unity8.desktop
-/usr/share/locale/*
-/usr/share/unity8/Applications/*
-/usr/share/unity8/Bottombar/*
-/usr/share/unity8/Components/*
-/usr/share/unity8/Dash/*
-/usr/share/unity8/Greeter/*
-/usr/share/unity8/Hud/*
-/usr/share/unity8/Launcher/*
-/usr/share/unity8/Notifications/*
-/usr/share/unity8/Panel/*
-/usr/share/unity8/Shell.qml
-/usr/share/unity8/SideStage/*
-/usr/share/unity8/graphics/*
-/usr/share/unity8/plugins/HudClient/*
-/usr/share/unity8/plugins/LightDM/*
-/usr/share/unity8/plugins/Ubuntu/*
-/usr/share/unity8/plugins/Unity/*
-/usr/share/unity8/plugins/Utils/*
+usr/bin/unity8
+usr/share/applications/unity8.desktop
+usr/share/locale
+usr/share/unity8/Applications
+usr/share/unity8/Bottombar
+usr/share/unity8/Components
+usr/share/unity8/Dash
+usr/share/unity8/Greeter
+usr/share/unity8/Hud
+usr/share/unity8/Launcher
+usr/share/unity8/Notifications
+usr/share/unity8/Panel
+usr/share/unity8/Shell.qml
+usr/share/unity8/SideStage
+usr/share/unity8/graphics

=== modified file 'main.cpp'
--- main.cpp	2013-06-26 15:16:54 +0000
+++ main.cpp	2013-06-28 14:53:52 +0000
@@ -39,10 +39,10 @@
         // don't duplicate
         const QString& path = paths[i];
         QStringList::iterator iter = qFind(importPathList.begin(), importPathList.end(), path);
-        if (iter == importPathList.end())
-            importPathList.prepend(path);
+        if (iter == importPathList.end()) {
+            engine->addImportPath(path);
+        }
     }
-    engine->setImportPathList(importPathList);
 }
 
 /* When you append and import path to the list of import paths it will be the *last*
@@ -54,10 +54,10 @@
     Q_FOREACH(const QString& path, paths) {
         // don't duplicate
         QStringList::iterator iter = qFind(importPathList.begin(), importPathList.end(), path);
-        if (iter == importPathList.end())
+        if (iter == importPathList.end()) {
             importPathList.append(path);
+        }
     }
-    importPathList.append(paths);
     engine->setImportPathList(importPathList);
 }
 
@@ -134,9 +134,8 @@
     QObject::connect(view->engine(), SIGNAL(quit()), qApp, SLOT(quit()));
 
     QUrl source("Shell.qml");
-    prependImportPaths(view->engine(), QStringList() << ::shellAppDirectory());
-    prependImportPaths(view->engine(), ::shellImportPaths());
-    appendImportPaths(view->engine(), QStringList() << ::fakePluginsImportPath());
+    prependImportPaths(view->engine(), ::overrideImportPaths());
+    appendImportPaths(view->engine(), ::fallbackImportPaths());
     view->setSource(source);
     view->setColor("transparent");
 

=== modified file 'paths.h.in'
--- paths.h.in	2013-06-26 13:02:26 +0000
+++ paths.h.in	2013-06-28 14:53:52 +0000
@@ -46,22 +46,23 @@
     }
 }
 
-inline QStringList shellImportPaths() {
+inline QStringList overrideImportPaths() {
     QStringList paths;
-    if (isRunningInstalled()) {
-        paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
-    } else {
+    if (!isRunningInstalled()) {
         paths << QString("@CMAKE_BINARY_DIR@/plugins");
     }
     return paths;
 }
 
-inline QString fakePluginsImportPath() {
+inline QStringList fallbackImportPaths() {
+    QStringList paths;
     if (isRunningInstalled()) {
-        return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins/mocks");
+        paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml");
+        paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml/mocks");
     } else {
-        return QString("@CMAKE_BINARY_DIR@/tests/mocks");
+        paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
     }
+    return paths;
 }
 
 inline QString sourceDirectory() {

=== modified file 'plugins/HudClient/CMakeLists.txt'
--- plugins/HudClient/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ plugins/HudClient/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -41,9 +41,9 @@
     )
 
 install(TARGETS HudClientQml
-    DESTINATION ${SHELL_APP_DIR}/plugins/HudClient
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/HudClient
     )
 
 install(FILES qmldir
-    DESTINATION ${SHELL_APP_DIR}/plugins/HudClient
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/HudClient
     )

=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2013-06-06 12:18:34 +0000
+++ plugins/LightDM/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -35,9 +35,9 @@
     )
 
 install(TARGETS LightDM-qml
-    DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/LightDM
     )
 
 install(FILES qmldir
-    DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/LightDM
     )

=== modified file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
--- plugins/Ubuntu/Gestures/CMakeLists.txt	2013-06-14 15:52:02 +0000
+++ plugins/Ubuntu/Gestures/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -27,9 +27,9 @@
 )
 
 install(TARGETS UbuntuGestureQml
-    DESTINATION ${SHELL_APP_DIR}/plugins/Ubuntu/Gestures
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Ubuntu/Gestures
     )
 
 install(FILES qmldir
-    DESTINATION ${SHELL_APP_DIR}/plugins/Ubuntu/Gestures
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Ubuntu/Gestures
     )

=== modified file 'plugins/Unity/CMakeLists.txt'
--- plugins/Unity/CMakeLists.txt	2013-06-06 10:37:13 +0000
+++ plugins/Unity/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -41,9 +41,9 @@
     )
 
 install(TARGETS Unity-qml
-    DESTINATION ${SHELL_APP_DIR}/plugins/Unity
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity
     )
 
 install(FILES qmldir
-    DESTINATION ${SHELL_APP_DIR}/plugins/Unity
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity
     )

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ plugins/Utils/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -28,9 +28,9 @@
     )
 
 install(TARGETS Utils-qml
-    DESTINATION ${SHELL_APP_DIR}/plugins/Utils
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Utils
     )
 
 install(FILES qmldir
-    DESTINATION ${SHELL_APP_DIR}/plugins/Utils
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Utils
     )

=== modified file 'run_on_device'
--- run_on_device	2013-06-24 11:08:38 +0000
+++ run_on_device	2013-06-28 14:53:52 +0000
@@ -86,16 +86,15 @@
 
 run() {
     SERVICEFILE="${CHROOT_PREFIX}/etc/device-services"
-    adb shell "egrep '$BINARY|qml-phone-shell' $SERVICEFILE"
+    adb shell "egrep '$BINARY' $SERVICEFILE"
     CONTAINS_SHELL=$?
     if [ $CONTAINS_SHELL -eq 0 ]; then
         echo "Modifying $SERVICEFILE on device. Old contents will be saved in $SERVICEFILE.backup"
         adb shell cp $SERVICEFILE $SERVICEFILE.backup
-        adb shell sed -i "/$BINARY\\\\\|qml-phone-shell/d" $SERVICEFILE
+        adb shell sed -i "/$BINARY/d" $SERVICEFILE
         if $FLIPPED; then exec_with_adb /usr/bin/service ubuntu-touch-session restart
         else exec_with_adb /usr/bin/service ubuntu-session restart; fi
     fi
-    adb shell pkill qml-phone-shell
     adb shell pkill $BINARY
     ARGS="--nomousetouch"
     if $GDB; then

=== added file 'tests/autopilot/setup.py'
--- tests/autopilot/setup.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/setup.py	2013-06-28 14:53:52 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2013 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+
+from distutils.core import setup
+from setuptools import find_packages
+
+setup(
+    name='unity',
+    version='8.0',
+    description='Unity 8 autopilot tests.',
+    url='https://launchpad.net/unity',
+    license='GPLv3',
+    packages=find_packages(),
+)

=== modified file 'tests/autopilot/unity8/tests/__init__.py'
--- tests/autopilot/unity8/tests/__init__.py	2013-06-05 22:03:08 +0000
+++ tests/autopilot/unity8/tests/__init__.py	2013-06-28 14:53:52 +0000
@@ -39,8 +39,7 @@
             self.launch_test_local(geometry)
 
     def launch_test_local(self, geometry):
-        os.environ['LD_LIBRARY_PATH'] = "../../../unity_build/build/lib:../../builddir/tests/mocks/LightDM/" + self.lightdm_mock
-        os.environ['QML2_IMPORT_PATH'] = "../../builddir/tests/mocks:../../builddir/plugins"
+        os.environ['LD_LIBRARY_PATH'] = "../../builddir/tests/mocks/LightDM/" + self.lightdm_mock
         if geometry != "0x0":
             self.app = self.launch_test_application(
                 "../../builddir/unity8", "-geometry", geometry, "-frameless", app_type='qt')
@@ -50,7 +49,6 @@
 
     def launch_test_installed(self, geometry):
         os.environ['LD_LIBRARY_PATH'] = "/usr/share/unity8/plugins/mocks/LightDM/" + self.lightdm_mock
-        os.environ['QML2_IMPORT_PATH'] = "/usr/share/unity8/plugins/mocks:/usr/share/unity8/plugins"
         if model() == 'Desktop' and geometry != "0x0":
             self.app = self.launch_test_application(
                "unity8", "-geometry", geometry, "-frameless", app_type='qt')

=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ tests/mocks/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -1,2 +1,4 @@
 add_subdirectory(LightDM)
 add_subdirectory(Ubuntu)
+add_subdirectory(Unity)
+add_subdirectory(HudClient)

=== renamed directory 'tests/qmltests/plugins/HudClient' => 'tests/mocks/HudClient'
=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	2013-06-06 12:18:34 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -44,9 +44,9 @@
     )
 
 install(TARGETS MockLightDM-qml
-    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM
     )
 
 install(FILES qmldir
-    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM
     )

=== modified file 'tests/mocks/LightDM/full/CMakeLists.txt'
--- tests/mocks/LightDM/full/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ tests/mocks/LightDM/full/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -16,5 +16,5 @@
                       OUTPUT_NAME lightdm-qt5-2)
 
 install(TARGETS MockLightDM-full
-    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/full
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/full
     )

=== modified file 'tests/mocks/LightDM/single-passphrase/CMakeLists.txt'
--- tests/mocks/LightDM/single-passphrase/CMakeLists.txt	2013-06-06 12:18:34 +0000
+++ tests/mocks/LightDM/single-passphrase/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -17,5 +17,5 @@
                       OUTPUT_NAME lightdm-qt5-2)
 
 install(TARGETS MockLightDM-single-passphrase
-    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single-passphrase
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/single-passphrase
     )

=== modified file 'tests/mocks/LightDM/single-pin/CMakeLists.txt'
--- tests/mocks/LightDM/single-pin/CMakeLists.txt	2013-06-06 12:18:34 +0000
+++ tests/mocks/LightDM/single-pin/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -17,5 +17,5 @@
                       OUTPUT_NAME lightdm-qt5-2)
 
 install(TARGETS MockLightDM-single-pin
-    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single-pin
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/single-pin
     )

=== modified file 'tests/mocks/LightDM/single/CMakeLists.txt'
--- tests/mocks/LightDM/single/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ tests/mocks/LightDM/single/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -16,5 +16,5 @@
                       OUTPUT_NAME lightdm-qt5-2)
 
 install(TARGETS MockLightDM-single
-    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/single
     )

=== modified file 'tests/mocks/Ubuntu/Application/CMakeLists.txt'
--- tests/mocks/Ubuntu/Application/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ tests/mocks/Ubuntu/Application/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -27,9 +27,9 @@
 )
 
 install(TARGETS FakeUbuntuApplicationQml
-    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/Ubuntu/Application
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Ubuntu/Application
     )
 
 install(FILES qmldir InputFilterArea.qml
-    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/Ubuntu/Application
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Ubuntu/Application
     )

=== modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
--- tests/mocks/Ubuntu/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ tests/mocks/Ubuntu/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -1,1 +1,2 @@
 add_subdirectory(Application)
+add_subdirectory(ChewieUI)

=== renamed directory 'tests/qmltests/plugins/Ubuntu/ChewieUI' => 'tests/mocks/Ubuntu/ChewieUI'
=== renamed directory 'tests/qmltests/plugins/Unity' => 'tests/mocks/Unity'
=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-06-19 08:30:17 +0000
+++ tests/qmltests/CMakeLists.txt	2013-06-28 14:53:52 +0000
@@ -1,12 +1,11 @@
 # add_qml_test macro
 include(QmlTest)
 
-add_subdirectory(plugins)
 add_subdirectory(Components)
 
 set(qmltest_DEFAULT_IMPORT_PATHS
-  ${CMAKE_CURRENT_BINARY_DIR}/plugins
   ${CMAKE_BINARY_DIR}/tests/utils/modules
+  ${CMAKE_BINARY_DIR}/tests/mocks
 )
 
 set(qmltest_DEFAULT_TARGETS qmlunittests)
@@ -44,22 +43,22 @@
 add_qml_test(Dash DashContent IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Dash DashPreview)
 add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
-add_qml_test(Dash ScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins)
+add_qml_test(Dash ScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins
                                            ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
-add_qml_test(Greeter Lockscreen IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
+add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
                              PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
-add_qml_test(Greeter Tablet IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
+add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
                             ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
-add_qml_test(Greeter Phone IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
+add_qml_test(Greeter Phone IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
                            ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
-add_qml_test(Greeter Infographics IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
+add_qml_test(Greeter Infographics IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
                                   ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
 add_qml_test(Hud Hud)
 add_qml_test(Hud Result)
 add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
-add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
+add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_SOURCE_DIR}/tests/mocks)
 add_qml_test(Panel IndicatorRow)
 add_qml_test(Panel Indicators)
 add_qml_test(Panel MenuContent)

=== removed directory 'tests/qmltests/plugins'
=== removed file 'tests/qmltests/plugins/CMakeLists.txt'
--- tests/qmltests/plugins/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ tests/qmltests/plugins/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-add_subdirectory(HudClient)
-add_subdirectory(Ubuntu)
-add_subdirectory(Unity)

=== removed directory 'tests/qmltests/plugins/Dee'
=== removed file 'tests/qmltests/plugins/Dee/DeeVariantText.qml'
--- tests/qmltests/plugins/Dee/DeeVariantText.qml	2013-06-05 22:03:08 +0000
+++ tests/qmltests/plugins/Dee/DeeVariantText.qml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-Item {
-    property variant value
-    property string text
-}

=== removed file 'tests/qmltests/plugins/Dee/qmldir'
--- tests/qmltests/plugins/Dee/qmldir	2013-06-05 22:03:08 +0000
+++ tests/qmltests/plugins/Dee/qmldir	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-module Dee
-
-DeeVariantText 3.0 DeeVariantText.qml

=== removed directory 'tests/qmltests/plugins/Ubuntu'
=== removed file 'tests/qmltests/plugins/Ubuntu/CMakeLists.txt'
--- tests/qmltests/plugins/Ubuntu/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ tests/qmltests/plugins/Ubuntu/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-add_subdirectory(ChewieUI)