Merge lp:~saviq/unity8/drop-scopes-env into lp:unity8

[Michał Sawicz]

UNITY_SCOPES_LIST is no more

 * 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?
N/A
 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1733
http://jenkins.qa.ubuntu.com/job/unity8-ci/5589/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2375/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/754
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/754
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2080/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2373
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2373/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19835

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

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Not really much to test since we were not using this anyway

 * Did CI run pass?
AP got broken, but it's a common issue, not here

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'data/unity8-dash.conf'
--- data/unity8-dash.conf	2014-10-24 18:40:40 +0000
+++ data/unity8-dash.conf	2015-04-21 15:43:07 +0000
@@ -18,11 +18,6 @@
 env APP_ID=unity8-dash
 
 pre-start script
-    if [ -z "$UNITY_SCOPES_LIST" ]; then
-        # FIXME: remove once we have this in dconf
-        initctl set-env UNITY_SCOPES_LIST="clickscope;musicaggregator;videoaggregator"
-    fi
-
     initctl emit scope-ui-starting
 end script