Merge lp:~xnox/indicator-session/unbreak-ubiquity into lp:indicator-session/14.04

[Dimitri John Ledkov]

* Make indicator-session DBus activated for ubiquity/lightdm (LP: #1258863):
  - Drop XDG autostart file, not needed
  - Reintroduce DBus activation file

* Make indicator-session DBus activated for ubiquity/lightdm (LP: #1258863):
  - Drop XDG autostart file, not needed
  - Reintroduce DBus activation file

[lp:~xnox/indicator-session/unbreak-ubiquity]

426. By Dimitri John Ledkov on 2013-12-08

Mark debian/rules as executable.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:426
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/113/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

This MR should wait for the resolution of sibling MR https://code.launchpad.net/~xnox/indicator-sound/unbreak-ubiquity/+merge/198170, since that's where xnox and ted seem to be hashing out the details of the change

Unmerged revisions

426. By Dimitri John Ledkov on 2013-12-08

Mark debian/rules as executable.

425. By Dimitri John Ledkov on 2013-12-08

* Make indicator-session DBus activated for ubiquity/lightdm (LP: #1258863):
  - Drop XDG autostart file, not needed
  - Reintroduce DBus activation file

=== modified file '.bzrignore'
--- .bzrignore	2013-05-29 19:37:22 +0000
+++ .bzrignore	2013-12-08 20:30:28 +0000
@@ -254,3 +254,4 @@
 dbus-user.h
 tests/test-service
 indicator-session.conf
+indicator-session.service

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-10-29 00:31:50 +0000
+++ data/CMakeLists.txt	2013-12-08 20:30:28 +0000
@@ -38,25 +38,24 @@
 
 
 ##
-##  XDG Autostart Config File
+##  DBus Service File
 ##
 
 # where to install
-set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
-message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart install dir")
+set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services")
+message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir")
 
-set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
-set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
-set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
+set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service")
+set (SERVICE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}")
+set (SERVICE_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in")
 
 # build it
 set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
-configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
+configure_file ("${SERVICE_FILE_IN}" "${SERVICE_FILE}")
 
 # install it
-install (FILES "${XDG_AUTOSTART_FILE}"
-         DESTINATION "${XDG_AUTOSTART_DIR}")
-
+install (FILES "${SERVICE_FILE}"
+         DESTINATION "${DBUS_SERVICE_DIR}")
 
 ##
 ##  Unity Indicator File

=== removed file 'data/indicator-session.desktop.in'
--- data/indicator-session.desktop.in	2013-10-29 00:31:50 +0000
+++ data/indicator-session.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Session
-Exec=@pkglibexecdir@/indicator-session-service
-NotShowIn=Unity;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-

=== added file 'data/indicator-session.service.in'
--- data/indicator-session.service.in	1970-01-01 00:00:00 +0000
+++ data/indicator-session.service.in	2013-12-08 20:30:28 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.indicator.session
+Exec=@pkglibexecdir@/indicator-session-service

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-25 03:57:00 +0000
+++ debian/changelog	2013-12-08 20:30:28 +0000
@@ -1,3 +1,11 @@
+indicator-session (12.10.5+14.04.20131125-0ubuntu2) UNRELEASED; urgency=low
+
+  * Make indicator-session DBus activated for ubiquity/lightdm (LP: #1258863):
+    - Drop XDG autostart file, not needed
+    - Reintroduce DBus activation file
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Sun, 08 Dec 2013 20:24:02 +0000
+
 indicator-session (12.10.5+14.04.20131125-0ubuntu1) trusty; urgency=low
 
   [ Charles Kerr ]

=== modified file 'debian/rules' (properties changed: -x to +x)