Merge lp:~saviq/unity8/fix-mock-indicator into lp:unity8

[Michał Sawicz]

Move mock indicator service to unity8-fake-env, as it's a binary-dependent package.

Also, wrap-and-sort for good measure.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Y
 * If you changed the UI, has there been a design review?
N/A

[Nick Dedekind (nick-dedekind)]

Looks good to me. Waiting CI

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1734
http://jenkins.qa.ubuntu.com/job/unity8-ci/5587/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/752
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2370
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2370/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19828

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5587/rebuild

review: Needs Fixing (continuous-integration)

[lp:~saviq/unity8/fix-mock-indicator]

1735. By Michał Sawicz on 2015-04-22

Add a Replaces field to unity8-fake-env

=== modified file 'debian/control'
--- debian/control	2015-04-02 13:09:18 +0000
+++ debian/control	2015-04-22 14:43:56 +0000
@@ -6,14 +6,14 @@
                dbus-test-runner,
                debhelper (>= 9),
                doxyqml,
-               graphviz,
-               gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
 # We rely on C++11 features, and to prevent from ABI breaks
 # in libstdc++ causing us issues, we explicitly select a G++
 # version. To allow cross-compiling to work, we also must
 # append :native to g++-4.9 so we don't try to run armhf g++
 # on an x86 CPU for eaxmple, when cross-compiling.
                g++-4.9:native,
+               graphviz,
+               gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
                libconnectivity-qt1-dev,
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                libgl1-mesa-dri,
@@ -169,6 +169,7 @@
          ${shlibs:Depends},
 Provides: unity-application-impl,
           unity-application-impl-4,
+Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 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.
@@ -180,8 +181,8 @@
 Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
          gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
          libhardware2,
+         pay-service,
          unity-schemas (>= 7.3.1+14.10.20140915),
-         pay-service,
          ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-launcher-impl,

=== modified file 'debian/indicators-client.install'
--- debian/indicators-client.install	2015-03-12 13:59:07 +0000
+++ debian/indicators-client.install	2015-04-22 14:43:56 +0000
@@ -1,2 +1,2 @@
+/usr/bin/indicators-client
 usr/share/applications/indicators-client.desktop
-/usr/bin/indicators-client

=== modified file 'debian/unity8-autopilot.install'
--- debian/unity8-autopilot.install	2015-03-12 13:59:07 +0000
+++ debian/unity8-autopilot.install	2015-04-22 14:43:56 +0000
@@ -1,4 +1,2 @@
-data/unity-mock-indicator-service.conf usr/share/upstart/sessions/
-usr/bin/unity-mock-indicator-service
 usr/lib/python*/*/unity*
-usr/share/unity8/unlock-device
\ No newline at end of file
+usr/share/unity8/unlock-device

=== modified file 'debian/unity8-fake-env.install'
--- debian/unity8-fake-env.install	2014-05-01 14:25:18 +0000
+++ debian/unity8-fake-env.install	2015-04-22 14:43:56 +0000
@@ -1,3 +1,5 @@
+data/unity-mock-indicator-service.conf usr/share/upstart/sessions/
+usr/bin/unity-mock-indicator-service
 usr/lib/*/unity8/qml/mocks
 usr/lib/*/unity8/qml/nonmirplugins
 usr/lib/*/unity8/qml/scopefakes

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2015-02-04 09:42:56 +0000
+++ debian/unity8-private.install	2015-04-22 14:43:56 +0000
@@ -1,16 +1,16 @@
 usr/lib/*/libunity8-private.*
+usr/lib/*/unity8/libUbuntuGestures*
 usr/lib/*/unity8/qml/AccountsService
 usr/lib/*/unity8/qml/Dash
 usr/lib/*/unity8/qml/Greeter
 usr/lib/*/unity8/qml/LightDM
 usr/lib/*/unity8/qml/Lights
 usr/lib/*/unity8/qml/Powerd
+usr/lib/*/unity8/qml/ScreenGrabber
 usr/lib/*/unity8/qml/SessionBroadcast
-usr/lib/*/unity8/qml/ScreenGrabber
 usr/lib/*/unity8/qml/Ubuntu
 usr/lib/*/unity8/qml/Unity
 usr/lib/*/unity8/qml/Utils
 usr/lib/*/unity8/qml/Wizard
-usr/lib/*/unity8/libUbuntuGestures*
 usr/share/accountsservice/interfaces
 usr/share/dbus-1/interfaces

=== modified file 'debian/unity8.install'
--- debian/unity8.install	2014-12-16 16:49:49 +0000
+++ debian/unity8.install	2015-04-22 14:43:56 +0000
@@ -1,10 +1,10 @@
-data/unity8.conf usr/share/upstart/sessions/
 data/unity8-dash.conf usr/share/upstart/sessions/
 data/unity8-filewatcher.conf usr/share/upstart/sessions/
+data/unity8.conf usr/share/upstart/sessions/
 usr/bin/unity8
 usr/bin/unity8-dash
+usr/share/applications/unity8-dash.desktop
 usr/share/applications/unity8.desktop
-usr/share/applications/unity8-dash.desktop
 usr/share/unity8/Greeter
 usr/share/unity8/Launcher
 usr/share/unity8/Panel