Merge lp:~thomas-voss/ubuntu-location-provider-here/fix-wizard-behavior into lp:ubuntu-location-provider-here/15.04

[Thomas Voß]

Just start up the espoo infrastructure.

Just start up the espoo infrastructure.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-location-provider-here-ci/22/rebuild

review: Approve (continuous-integration)

=== modified file 'etc/init/ubuntu-location-provider-here-after-wizard.conf'
--- etc/init/ubuntu-location-provider-here-after-wizard.conf	2015-06-01 17:46:15 +0000
+++ etc/init/ubuntu-location-provider-here-after-wizard.conf	2016-01-15 11:01:26 +0000
@@ -18,14 +18,7 @@
         stop; exit 0
     fi
 				    
-    sleep 5
-
-    stop ubuntu-location-provider-here-posclientd || true
-    stop ubuntu-location-provider-here-slpgwd || true
-    stop ubuntu-location-service || true
-
     start ubuntu-location-provider-here-slpgwd || true
-    start ubuntu-location-service
 
     touch /home/phablet/.config/ubuntu-system-settings/wizard-has-run-and-location-job-too
     stop; exit 0