Online Accounts: Sign-on UI

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

  1. master
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 133
Merged at revision: 133
Proposed branch: lp:~online-accounts/signon-ui/master
Merge into: lp:signon-ui
Diff against target: 44 lines (+11/-5)
3 files modified
debian/control (+9/-3)
src/com.canonical.indicators.webcredentials.service.in (+1/-1)
src/com.nokia.singlesignonui.service.in (+1/-1)
To merge this branch: bzr merge lp:~online-accounts/signon-ui/master
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Online Accounts Pending
Review via email: mp+222027@code.launchpad.net

Commit message

New release

- Add signon-ui-service, to fix co-installation with u-s-s-o-a
- Use Oxide instead of WebKit2

Description of the change

New release

- Add signon-ui-service, to fix co-installation with u-s-s-o-a
- Use Oxide instead of WebKit2

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:132
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-utopic-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/signon-ui-utopic-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ui-ci/59/rebuild

review: Approve (continuous-integration)
lp:~online-accounts/signon-ui/master updated
133. By Alberto Mardegan

Add dummy package for signon-ui

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/60/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/signon-ui-utopic-amd64-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/signon-ui-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ui-ci/60/rebuild

review: Needs Fixing (continuous-integration)
lp:~online-accounts/signon-ui/master updated
134. By Alberto Mardegan

Merge from trunk

[ Alberto Mardegan ]
[ Ubuntu daily release ]
New rebuild forced

135. By Alberto Mardegan

Update service files to use online-accounts-service

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-06-04 12:25:25 +0000
3+++ debian/control 2014-08-13 12:25:59 +0000
4@@ -38,9 +38,6 @@
5 Depends: ${misc:Depends},
6 ${shlibs:Depends},
7 signon-ui-service
8-Conflicts: signon-ui
9-Replaces: signon-ui
10-Provides: signon-ui
11 Description: Single Sign-on UI
12 UI for the signond Single Signon service
13
14@@ -52,3 +49,12 @@
15 Replaces: signon-ui (<< 0.17), ubuntu-system-settings-online-accounts (<< 0.4)
16 Description: D-Bus service file for signon-ui
17 This D-Bus service is used to provide a UI for authenticating online accounts.
18+
19+Package: signon-ui
20+Architecture: all
21+Multi-Arch: foreign
22+Depends: ${misc:Depends},
23+ signon-ui-x11 | ubuntu-system-settings-online-accounts (>= 0.4)
24+Description: Dummy transitional package for signon-ui
25+ Dummy package for transitioning signon-ui to signon-ui-x11 or
26+ ubuntu-system-settings-online-accounts.
27
28=== modified file 'src/com.canonical.indicators.webcredentials.service.in'
29--- src/com.canonical.indicators.webcredentials.service.in 2014-06-04 12:05:04 +0000
30+++ src/com.canonical.indicators.webcredentials.service.in 2014-08-13 12:25:59 +0000
31@@ -1,3 +1,3 @@
32 [D-BUS Service]
33 Name=com.canonical.indicators.webcredentials
34-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'"
35+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'"
36
37=== modified file 'src/com.nokia.singlesignonui.service.in'
38--- src/com.nokia.singlesignonui.service.in 2014-06-04 12:05:04 +0000
39+++ src/com.nokia.singlesignonui.service.in 2014-08-13 12:25:59 +0000
40@@ -1,3 +1,3 @@
41 [D-BUS Service]
42 Name=com.nokia.singlesignonui
43-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'"
44+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

to all changes: