Merge lp:~dobey/pay-service/fix-script-path into lp:pay-service/14.10

[dobey]

Recommend libglib2.0-bin and upstart as setup-staging.sh requires them.
Specify the full path to initctl and restart as /sbin is not in $PATH.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12
http://jenkins.qa.ubuntu.com/job/pay-service-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/18/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-06-13 17:05:49 +0000
+++ debian/control	2014-06-30 17:32:19 +0000
@@ -31,6 +31,8 @@
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+Recommends: libglib2.0-bin,
+            upstart,
 Description: service to allow requesting payment for an item
  Allows applications to request an item be paid for by the user.
  This requires interaction with the server backend to handle the

=== modified file 'tests/setup-staging.sh'
--- tests/setup-staging.sh	2014-06-30 17:32:19 +0000
+++ tests/setup-staging.sh	2014-06-30 17:32:19 +0000
@@ -13,13 +13,13 @@
 
 echo "Setting up upstart environment variables"
 
-initctl set-env --global SSO_AUTH_BASE_URL=$SSO_AUTH_BASE_URL
-initctl set-env --global SSO_UONE_BASE_URL=$SSO_UONE_BASE_URL
-initctl set-env --global PAY_BASE_URL=$PAY_BASE_URL
-initctl set-env --global URL_PACKAGE_INFO=$URL_PACKAGE_INFO
-initctl set-env --global ACCOUNT_CREDS_URL=$ACCOUNT_CREDS_URL
-initctl set-env --global ADD_PAYMENT_URL=$ADD_PAYMENT_URL
-initctl set-env --global U1_SEARCH_BASE_URL=$U1_SEARCH_BASE_URL
+/sbin/initctl set-env --global SSO_AUTH_BASE_URL=$SSO_AUTH_BASE_URL
+/sbin/initctl set-env --global SSO_UONE_BASE_URL=$SSO_UONE_BASE_URL
+/sbin/initctl set-env --global PAY_BASE_URL=$PAY_BASE_URL
+/sbin/initctl set-env --global URL_PACKAGE_INFO=$URL_PACKAGE_INFO
+/sbin/initctl set-env --global ACCOUNT_CREDS_URL=$ACCOUNT_CREDS_URL
+/sbin/initctl set-env --global ADD_PAYMENT_URL=$ADD_PAYMENT_URL
+/sbin/initctl set-env --global U1_SEARCH_BASE_URL=$U1_SEARCH_BASE_URL
 
 echo "Setting up dbus environment variables"
 
@@ -30,7 +30,7 @@
 	"[{'SSO_AUTH_BASE_URL', '$SSO_AUTH_BASE_URL'}, {'SSO_UONE_BASE_URL', '$SSO_UONE_BASE_URL'}, {'PAY_BASE_URL', '$PAY_BASE_URL'}, {'URL_PACKAGE_INFO', '$URL_PACKAGE_INFO'}, {'ACCOUNT_CREDS_URL', '$ACCOUNT_CREDS_URL'}, {'ADD_PAYMENT_URL', '$ADD_PAYMENT_URL'}, {'U1_SEARCH_BASE_URL', '$U1_SEARCH_BASE_URL'}]"
 
 echo "Restarting scope registry"
-restart scope-registry
+/sbin/restart scope-registry
 
 echo "Restarting pay service"
-restart pay-service
+/sbin/restart pay-service