Session Menu

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

  1. unbreak-ubiquity
  2. Merge into trunk.14.04
Proposed by Dimitri John Ledkov
Status: Rejected
Rejected by: Dimitri John Ledkov
Proposed branch: lp:~xnox/indicator-session/unbreak-ubiquity
Merge into: lp:indicator-session/14.04
Diff against target: 87 lines (+21/-19)
5 files modified
.bzrignore (+1/-0)
data/CMakeLists.txt (+9/-10)
data/indicator-session.desktop.in (+0/-9)
data/indicator-session.service.in (+3/-0)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~xnox/indicator-session/unbreak-ubiquity
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Indicator Applet Developers Pending
Review via email: mp+198178@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
lp:~xnox/indicator-session/unbreak-ubiquity updated
426. By Dimitri John Ledkov

Mark debian/rules as executable.

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

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)
Revision history for this message
Charles Kerr (charlesk) wrote :

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

Mark debian/rules as executable.

425. By Dimitri John Ledkov

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2013-05-29 19:37:22 +0000
+++ .bzrignore 2013-12-08 20:30:28 +0000
@@ -254,3 +254,4 @@
254dbus-user.h254dbus-user.h
255tests/test-service255tests/test-service
256indicator-session.conf256indicator-session.conf
257indicator-session.service
257258
=== 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 @@
3838
3939
40##40##
41## XDG Autostart Config File41## DBus Service File
42##42##
4343
44# where to install44# where to install
45set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")45set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services")
46message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart install dir")46message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir")
4747
48set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")48set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service")
49set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")49set (SERVICE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}")
50set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")50set (SERVICE_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in")
5151
52# build it52# build it
53set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")53set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
54configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")54configure_file ("${SERVICE_FILE_IN}" "${SERVICE_FILE}")
5555
56# install it56# install it
57install (FILES "${XDG_AUTOSTART_FILE}"57install (FILES "${SERVICE_FILE}"
58 DESTINATION "${XDG_AUTOSTART_DIR}")58 DESTINATION "${DBUS_SERVICE_DIR}")
59
6059
61##60##
62## Unity Indicator File61## Unity Indicator File
6362
=== 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 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Session
4Exec=@pkglibexecdir@/indicator-session-service
5NotShowIn=Unity;
6NoDisplay=true
7StartupNotify=false
8Terminal=false
9
100
=== 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 @@
1[D-BUS Service]
2Name=com.canonical.indicator.session
3Exec=@pkglibexecdir@/indicator-session-service
04
=== 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 @@
1indicator-session (12.10.5+14.04.20131125-0ubuntu2) UNRELEASED; urgency=low
2
3 * Make indicator-session DBus activated for ubiquity/lightdm (LP: #1258863):
4 - Drop XDG autostart file, not needed
5 - Reintroduce DBus activation file
6
7 -- Dmitrijs Ledkovs <xnox@ubuntu.com> Sun, 08 Dec 2013 20:24:02 +0000
8
1indicator-session (12.10.5+14.04.20131125-0ubuntu1) trusty; urgency=low9indicator-session (12.10.5+14.04.20131125-0ubuntu1) trusty; urgency=low
210
3 [ Charles Kerr ]11 [ Charles Kerr ]
412
=== modified file 'debian/rules' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches