Merge lp:~ted/indicator-secret-agent/upstart-job into lp:~indicator-applet-developers/indicator-secret-agent/trunk

Proposed by Ted Gould
Status: Merged
Approved by: Pete Woods
Approved revision: 15
Merged at revision: 11
Proposed branch: lp:~ted/indicator-secret-agent/upstart-job
Merge into: lp:~indicator-applet-developers/indicator-secret-agent/trunk
Diff against target: 40 lines (+21/-1)
3 files modified
data/CMakeLists.txt (+12/-0)
data/indicator-secret-agent.conf.in (+8/-0)
src/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~ted/indicator-secret-agent/upstart-job
Reviewer Review Type Date Requested Status
Pete Woods (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+180356@code.launchpad.net

Commit message

Adding an Upstart job configuration file

Description of the change

Exciting

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Pete Woods (pete-woods) wrote :

Awesome, thanks Ted!

review: Approve

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-09 17:34:05 +0000
3+++ data/CMakeLists.txt 2013-08-15 15:00:00 +0000
4@@ -0,0 +1,12 @@
5+
6+configure_file (
7+ indicator-secret-agent.conf.in
8+ indicator-secret-agent.conf
9+ @ONLY
10+)
11+
12+install (
13+ FILES ${CMAKE_CURRENT_BINARY_DIR}/indicator-secret-agent.conf
14+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions
15+)
16+
17
18=== added file 'data/indicator-secret-agent.conf.in'
19--- data/indicator-secret-agent.conf.in 1970-01-01 00:00:00 +0000
20+++ data/indicator-secret-agent.conf.in 2013-08-15 15:00:00 +0000
21@@ -0,0 +1,8 @@
22+description "Secret agent to repsond to Network Manager password requests"
23+
24+start on starting indicator-network
25+stop on stopping indicator-network
26+
27+respawn
28+
29+exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-secret-agent
30
31=== modified file 'src/CMakeLists.txt'
32--- src/CMakeLists.txt 2013-08-14 12:50:34 +0000
33+++ src/CMakeLists.txt 2013-08-15 15:00:00 +0000
34@@ -61,5 +61,5 @@
35
36 install(
37 TARGETS indicator-secret-agent-bin
38- RUNTIME DESTINATION bin
39+ RUNTIME DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}"
40 )

Subscribers

People subscribed via source and target branches