Merge lp:~sergiusens/account-polld/oa_fixes into lp:~phablet-team/account-polld/trunk

[Sergio Schvezov]

Minor fixes to paths and updates to use the system credentials.

Minor fixes to paths and updates to use the system credentials.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/account-polld-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/10/rebuild

review: Approve (continuous-integration)

=== modified file 'data/google-gmail-poll.service'
--- data/google-gmail-poll.service	2014-07-17 19:52:56 +0000
+++ data/google-gmail-poll.service	2014-07-24 20:23:54 +0000
@@ -12,9 +12,6 @@
       <group name="oauth2">
         <group name="web_server">
           <setting type="as" name="Scope">['email','https://www.googleapis.com/auth/gmail.readonly']</setting>
-          
-          <setting name="ClientId">[e-mail]</setting>
-          <setting name="ClientSecret">fOpQF6NQvxKwMk5X2WffjgaI</setting>
         </group>
       </group>
     </group>

=== modified file 'debian/rules'
--- debian/rules	2014-07-23 18:31:38 +0000
+++ debian/rules	2014-07-24 20:23:54 +0000
@@ -28,11 +28,11 @@
 		${CURDIR}/debian/account-polld/usr/bin
 	# setup online accounts service files
 	mkdir -p \
-		${CURDIR}/debian/account-polld/usr/share/accounts/application \
+		${CURDIR}/debian/account-polld/usr/share/accounts/applications \
 		${CURDIR}/debian/account-polld/usr/share/accounts/services \
 		${CURDIR}/debian/account-polld/usr/share/applications
 	cp ${CURDIR}/data/account-polld.application \
-		${CURDIR}/debian/account-polld/usr/share/accounts/application/
+		${CURDIR}/debian/account-polld/usr/share/accounts/applications/
 	cp ${CURDIR}/data/google-gmail-poll.service \
 		${CURDIR}/debian/account-polld/usr/share/accounts/services/
 	cp ${CURDIR}/data/account-polld.desktop \