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

[Alberto Mardegan]

Use signon-ui-service, to fix co-installation with of signon-ui.

Use signon-ui-service, to fix co-installation with of signon-ui.

[Sebastien Bacher (seb128)]

The technical side of the changes look fine, but there is an issue than ubuntu-system-settings-online-accounts is in universe and signon-ui in main, you can't create the depends this way. Could you build the service from signon-ui instead?

review: Needs Fixing

[lp:~mardy/ubuntu-system-settings-online-accounts/signon-ui-service]

124. By Alberto Mardegan on 2014-06-04

Move service to signon-ui

[Sebastien Bacher (seb128)]

looks good, thanks

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-05-28 08:51:22 +0000
+++ .bzrignore	2014-06-04 12:01:04 +0000
@@ -31,7 +31,6 @@
 /debian/*.substvars
 /plugins/example/libexample.so*
 /po/*.mo
-/src/com.canonical.indicators.webcredentials.service
 /src/com.ubuntu.OnlineAccountsUi.service
 /src/module/OnlineAccountsPlugin.pc
 /src/module/libOnlineAccountsPlugin.so*

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-30 13:30:35 +0000
+++ debian/changelog	2014-06-04 12:01:04 +0000
@@ -1,3 +1,9 @@
+ubuntu-system-settings-online-accounts (0.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add signon-ui-service, to fix co-installation of signon-ui.
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 04 Jun 2014 12:33:54 +0300
+
 ubuntu-system-settings-online-accounts (0.3+14.10.20140530.1-0ubuntu1) utopic; urgency=low
 
   [ CI bot ]

=== modified file 'debian/control'
--- debian/control	2014-05-28 08:51:22 +0000
+++ debian/control	2014-06-04 12:01:04 +0000
@@ -34,10 +34,9 @@
          ${shlibs:Depends},
          qtdeclarative5-accounts-plugin (>= 0.3),
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
+         signon-ui-service,
          ubuntu-system-settings
-Conflicts: signon-ui
 Provides: signon-ui
-Replaces: signon-ui
 Description: Online Accounts setup for Ubuntu Touch
  Online Accounts setup utility for the Ubuntu Touch System Settings.
 

=== modified file 'debian/ubuntu-system-settings-online-accounts.install'
--- debian/ubuntu-system-settings-online-accounts.install	2014-05-28 08:51:22 +0000
+++ debian/ubuntu-system-settings-online-accounts.install	2014-06-04 12:01:04 +0000
@@ -4,8 +4,6 @@
 usr/lib/*/ubuntu-system-settings
 usr/share/applications/online-accounts-ui.desktop
 usr/share/click/hooks
-usr/share/dbus-1/services/com.canonical.indicators.webcredentials.service
-usr/share/dbus-1/services/com.nokia.singlesignonui.service
 usr/share/dbus-1/services/com.ubuntu.OnlineAccountsUi.service
 usr/share/locale
 usr/share/ubuntu/settings

=== removed file 'src/com.canonical.indicators.webcredentials.service.in'
--- src/com.canonical.indicators.webcredentials.service.in	2014-04-29 12:11:55 +0000
+++ src/com.canonical.indicators.webcredentials.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicators.webcredentials
-Exec=$${INSTALL_PREFIX}/bin/signon-ui

=== removed file 'src/com.nokia.singlesignonui.service.in'
--- src/com.nokia.singlesignonui.service.in	2014-04-29 12:11:55 +0000
+++ src/com.nokia.singlesignonui.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.singlesignonui
-Exec=$${INSTALL_PREFIX}/bin/$${TARGET} --desktop_file_hint=$${desktop.path}/$${TARGET}.desktop

=== modified file 'src/online-accounts-ui.pro'
--- src/online-accounts-ui.pro	2014-04-30 12:37:32 +0000
+++ src/online-accounts-ui.pro	2014-06-04 12:01:04 +0000
@@ -99,8 +99,6 @@
     $${RESOURCES}
 
 QMAKE_SUBSTITUTES += \
-    com.canonical.indicators.webcredentials.service.in \
-    com.nokia.singlesignonui.service.in \
     com.ubuntu.OnlineAccountsUi.service.in \
     online-accounts-ui.desktop.in
 
@@ -109,8 +107,6 @@
 
 service.path = $${INSTALL_PREFIX}/share/dbus-1/services
 service.files = \
-    com.canonical.indicators.webcredentials.service \
-    com.nokia.singlesignonui.service \
     com.ubuntu.OnlineAccountsUi.service
 INSTALLS += service