Merge lp:~lool/ubuntu-location-provider-here/lp1389874 into lp:ubuntu-location-provider-here

[Loïc Minier]

Wait for NM and oFono to be started before starting slpgwd due to a bug in location-service-connectivity API (LP 1390490); works around LP: #1389874.

Wait for NM and oFono to be started before starting slpgwd due to a bug in location-service-connectivity API (LP 1390490); works around LP: #1389874.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Loïc Minier (lool)]

NB: self approved as I already had multiple people test the trivial change and discussed this with Thomas

[Manuel de la Peña (mandel)]

Looks good.

review: Approve

=== modified file 'etc/init/ubuntu-location-provider-here-slpgwd.conf'
--- etc/init/ubuntu-location-provider-here-slpgwd.conf	2014-09-17 14:33:49 +0000
+++ etc/init/ubuntu-location-provider-here-slpgwd.conf	2014-11-09 23:36:54 +0000
@@ -2,7 +2,7 @@
 
 # this requires DBus and consumes data from oFono and NM; should cope with DBus
 # services restarting though
-start on started dbus and (started ofono or started network-manager)
+start on started dbus and started ofono and started network-manager
 stop on stopping dbus
 
 respawn