Online Accounts: Sign-on UI

Merge lp:~mardy/signon-ui/online-accounts-service into lp:~online-accounts/signon-ui/master

  1. online-accounts-service
  2. Merge into master
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 133
Merged at revision: 135
Proposed branch: lp:~mardy/signon-ui/online-accounts-service
Merge into: lp:~online-accounts/signon-ui/master
Diff against target: 37 lines (+8/-4)
3 files modified
debian/changelog (+6/-2)
src/com.canonical.indicators.webcredentials.service.in (+1/-1)
src/com.nokia.singlesignonui.service.in (+1/-1)
To merge this branch: bzr merge lp:~mardy/signon-ui/online-accounts-service
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Review via email: mp+230437@code.launchpad.net

Commit message

Update service files to use online-accounts-service

Description of the change

Update service files to use online-accounts-service

This must land together with https://code.launchpad.net/~mardy/ubuntu-system-settings-online-accounts/headless-service/+merge/230433

To post a comment you must log in.
Revision history for this message
David Barth (dbarth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-06-04 12:25:25 +0000
3+++ debian/changelog 2014-08-12 07:42:16 +0000
4@@ -1,9 +1,13 @@
5-signon-ui (0.17-0ubuntu1) UNRELEASED; urgency=medium
6+signon-ui (0.17+14.10.20140612-0ubuntu1) utopic; urgency=medium
7
8+ [ Alberto Mardegan ]
9 * Use Oxide instead of WebKit2
10 * Add signon-ui-service, to fix co-installation with u-s-s-o-a
11
12- -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 04 Jun 2014 12:34:30 +0300
13+ [ Ubuntu daily release ]
14+ * New rebuild forced
15+
16+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 12 Jun 2014 13:35:05 +0000
17
18 signon-ui (0.16+14.10.20140530-0ubuntu1) utopic; urgency=low
19
20
21=== modified file 'src/com.canonical.indicators.webcredentials.service.in'
22--- src/com.canonical.indicators.webcredentials.service.in 2014-06-04 12:05:04 +0000
23+++ src/com.canonical.indicators.webcredentials.service.in 2014-08-12 07:42:16 +0000
24@@ -1,3 +1,3 @@
25 [D-BUS Service]
26 Name=com.canonical.indicators.webcredentials
27-Exec=/bin/sh -c "'if [ ! -x $${target.path}/$${TARGET} ] || [ \"$QT_QPA_PLATFORM\" = \"ubuntumirclient\" ]; then exec /usr/bin/online-accounts-ui --desktop_file_hint=/usr/share/applications/online-accounts-ui.desktop; else exec $${target.path}/$${TARGET}; fi'"
28+Exec=/bin/sh -c "'if [ ! -x $${target.path}/$${TARGET} ] || [ \"$QT_QPA_PLATFORM\" = \"ubuntumirclient\" ]; then exec /usr/bin/online-accounts-service; else exec $${target.path}/$${TARGET}; fi'"
29
30=== modified file 'src/com.nokia.singlesignonui.service.in'
31--- src/com.nokia.singlesignonui.service.in 2014-06-04 12:05:04 +0000
32+++ src/com.nokia.singlesignonui.service.in 2014-08-12 07:42:16 +0000
33@@ -1,3 +1,3 @@
34 [D-BUS Service]
35 Name=com.nokia.singlesignonui
36-Exec=/bin/sh -c "'if [ ! -x $${target.path}/$${TARGET} ] || [ \"$QT_QPA_PLATFORM\" = \"ubuntumirclient\" ]; then exec /usr/bin/online-accounts-ui --desktop_file_hint=/usr/share/applications/online-accounts-ui.desktop; else exec $${target.path}/$${TARGET}; fi'"
37+Exec=/bin/sh -c "'if [ ! -x $${target.path}/$${TARGET} ] || [ \"$QT_QPA_PLATFORM\" = \"ubuntumirclient\" ]; then exec /usr/bin/online-accounts-service; else exec $${target.path}/$${TARGET}; fi'"

Subscribers

People subscribed via source and target branches