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

[Alberto Mardegan]

Add signon-ui-service, to fix co-installation with u-s-s-o-a

Add also debian .install files for signon-ui, and make sure that unit tests are not installed.

Add signon-ui-service, to fix co-installation with u-s-s-o-a

Add also debian .install files for signon-ui, and make sure that unit tests are not installed.

[Sebastien Bacher (seb128)]

If you rename signon-ui to signon-ui-x11 you want to use Conflicts/Replaces/Provides without versions. You also should build the service from signon-ui since it's in main and u-s-s-o-a is in universe

review: Needs Fixing

[lp:~mardy/signon-ui/signon-ui-service]

133. By Alberto Mardegan on 2014-06-04

Add signon-ui-service, do not install tests

[Sebastien Bacher (seb128)]

Looks good to me, thanks!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-04-22 14:08:45 +0000
+++ .bzrignore	2014-06-04 12:05:33 +0000
@@ -14,7 +14,9 @@
 builddir
 core
 /debian/files
-/debian/signon-ui
+/debian/signon-ui-service
+/debian/signon-ui-x11
+/debian/tmp
 Makefile
 Makefile.*
 moc_*

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-09 11:00:40 +0000
+++ debian/changelog	2014-06-04 12:05:33 +0000
@@ -1,8 +1,9 @@
-signon-ui (0.16+14.04.20140505-0ubuntu1) UNRELEASED; urgency=medium
+signon-ui (0.17-0ubuntu1) UNRELEASED; urgency=medium
 
   * Use Oxide instead of WebKit2
+  * Use signon-ui-service, to fix co-installation with u-s-s-o-a
 
- -- Alberto Mardegan <[e-mail]>  Tue, 06 May 2014 14:52:52 +0300
+ -- Alberto Mardegan <[e-mail]>  Wed, 04 Jun 2014 12:34:30 +0300
 
 signon-ui (0.16+14.04.20140304.is.0.15+14.04.20140313-0ubuntu2) utopic; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-04-29 19:06:14 +0000
+++ debian/control	2014-06-04 12:05:33 +0000
@@ -33,9 +33,22 @@
 # just go ahead.  ~online-accounts will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~online-accounts/signon-ui/trunk
 
-Package: signon-ui
+Package: signon-ui-x11
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         signon-ui-service
+Conflicts: signon-ui
+Replaces: signon-ui
+Provides: signon-ui
 Description: Single Sign-on UI
  UI for the signond Single Signon service
+
+Package: signon-ui-service
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Breaks: signon-ui (<< 0.17), ubuntu-system-settings-online-accounts (<< 0.4)
+Replaces: signon-ui (<< 0.17), ubuntu-system-settings-online-accounts (<< 0.4)
+Description: D-Bus service file for signon-ui
+ This D-Bus service is used to provide a UI for authenticating online accounts.

=== added file 'debian/signon-ui-service.install'
--- debian/signon-ui-service.install	1970-01-01 00:00:00 +0000
+++ debian/signon-ui-service.install	2014-06-04 12:05:33 +0000
@@ -0,0 +1,2 @@
+usr/share/dbus-1/services/com.canonical.indicators.webcredentials.service
+usr/share/dbus-1/services/com.nokia.singlesignonui.service

=== added file 'debian/signon-ui-x11.install'
--- debian/signon-ui-x11.install	1970-01-01 00:00:00 +0000
+++ debian/signon-ui-x11.install	2014-06-04 12:05:33 +0000
@@ -0,0 +1,2 @@
+usr/bin/signon-ui
+usr/share/applications/signon-ui.desktop

=== added file 'src/com.canonical.indicators.webcredentials.service.in'
--- src/com.canonical.indicators.webcredentials.service.in	1970-01-01 00:00:00 +0000
+++ src/com.canonical.indicators.webcredentials.service.in	2014-06-04 12:05:33 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.indicators.webcredentials
+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'"

=== removed file 'src/com.canonical.indicators.webcredentials.service.in'
--- src/com.canonical.indicators.webcredentials.service.in	2013-06-10 11:04:32 +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

=== added file 'src/com.nokia.singlesignonui.service.in'
--- src/com.nokia.singlesignonui.service.in	1970-01-01 00:00:00 +0000
+++ src/com.nokia.singlesignonui.service.in	2014-06-04 12:05:33 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.nokia.singlesignonui
+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'"

=== removed file 'src/com.nokia.singlesignonui.service.in'
--- src/com.nokia.singlesignonui.service.in	2014-04-23 08:10:39 +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/signon-ui$${COMMANDLINE}

=== modified file 'tests/unit/tst_inactivity_timer.pro'
--- tests/unit/tst_inactivity_timer.pro	2013-03-14 13:19:02 +0000
+++ tests/unit/tst_inactivity_timer.pro	2014-06-04 12:05:33 +0000
@@ -1,6 +1,5 @@
 include(../../common-project-config.pri)
 include($${TOP_SRC_DIR}/common-vars.pri)
-include($${TOP_SRC_DIR}/common-installs-config.pri)
 
 TARGET = tst_inactivity_timer
 

=== modified file 'tests/unit/tst_signon_ui.pro'
--- tests/unit/tst_signon_ui.pro	2013-06-17 11:21:13 +0000
+++ tests/unit/tst_signon_ui.pro	2014-06-04 12:05:33 +0000
@@ -1,6 +1,5 @@
 include(../../common-project-config.pri)
 include($${TOP_SRC_DIR}/common-vars.pri)
-include($${TOP_SRC_DIR}/common-installs-config.pri)
 
 TARGET = signon-ui-unittest