Indicator Location

Merge lp:~ted/indicator-location/upstart-job into lp:indicator-location/14.04

  1. upstart-job
  2. Merge into trunk.14.04
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 45
Merged at revision: 55
Proposed branch: lp:~ted/indicator-location/upstart-job
Merge into: lp:indicator-location/14.04
Diff against target: 99 lines (+55/-21)
4 files modified
data/CMakeLists.txt (+38/-18)
data/indicator-location.conf.in (+8/-0)
data/indicator-location.desktop.in (+9/-0)
data/indicator-location.service.in (+0/-3)
To merge this branch: bzr merge lp:~ted/indicator-location/upstart-job
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+193096@code.launchpad.net

This proposal supersedes a proposal from 2013-08-27.

Description of the change

No description needed

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

FAILED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/16
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/16/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/16/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/17/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-location-ci/25/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2013-08-26 20:34:44 +0000
3+++ data/CMakeLists.txt 2013-10-29 16:43:37 +0000
4@@ -1,22 +1,42 @@
5 ##
6-## DBus Service File
7-##
8-
9-# where to install
10-set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services")
11-message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir")
12-
13-set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service")
14-set (SERVICE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}")
15-set (SERVICE_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in")
16-
17-# build it
18-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
19-configure_file ("${SERVICE_FILE_IN}" "${SERVICE_FILE}")
20-
21-# install it
22-install (FILES "${SERVICE_FILE}"
23- DESTINATION "${DBUS_SERVICE_DIR}")
24+## Upstart Job File
25+##
26+
27+# where to install
28+set (UPSTART_JOBS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions")
29+message (STATUS "${UPSTART_JOBS_DIR} is the Upstart Jobs File install dir")
30+
31+set (UPSTART_JOB_NAME "${CMAKE_PROJECT_NAME}.conf")
32+set (UPSTART_JOB_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_JOB_NAME}")
33+set (UPSTART_JOB_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_JOB_NAME}.in")
34+
35+# build it
36+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
37+configure_file ("${UPSTART_JOB_FILE_IN}" "${UPSTART_JOB_FILE}")
38+
39+# install it
40+install (FILES "${UPSTART_JOB_FILE}"
41+ DESTINATION "${UPSTART_JOBS_DIR}")
42+
43+##
44+## XDG Autostart File
45+##
46+
47+# where to install
48+set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
49+message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart install dir")
50+
51+set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
52+set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
53+set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
54+
55+# build it
56+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
57+configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
58+
59+# install it
60+install (FILES "${XDG_AUTOSTART_FILE}"
61+ DESTINATION "${XDG_AUTOSTART_DIR}")
62
63 ##
64 ## Unity Indicator File
65
66=== added file 'data/indicator-location.conf.in'
67--- data/indicator-location.conf.in 1970-01-01 00:00:00 +0000
68+++ data/indicator-location.conf.in 2013-10-29 16:43:37 +0000
69@@ -0,0 +1,8 @@
70+description "Indicator Location Backend"
71+
72+start on indicators-loaded or indicator-services-start
73+stop on desktop-end or indicator-services-end
74+
75+respawn
76+
77+exec @pkglibexecdir@/indicator-location-service
78
79=== added file 'data/indicator-location.desktop.in'
80--- data/indicator-location.desktop.in 1970-01-01 00:00:00 +0000
81+++ data/indicator-location.desktop.in 2013-10-29 16:43:37 +0000
82@@ -0,0 +1,9 @@
83+[Desktop Entry]
84+Type=Application
85+Name=Indicator Location
86+Exec=@pkglibexecdir@/indicator-location-service
87+NotShowIn=Unity;
88+NoDisplay=true
89+StartupNotify=false
90+Terminal=false
91+
92
93=== removed file 'data/indicator-location.service.in'
94--- data/indicator-location.service.in 2013-08-11 16:43:06 +0000
95+++ data/indicator-location.service.in 1970-01-01 00:00:00 +0000
96@@ -1,3 +0,0 @@
97-[D-BUS Service]
98-Name=com.canonical.indicator.location
99-Exec=@pkglibexecdir@/indicator-location-service

Subscribers

People subscribed via source and target branches