indicator-power

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

  1. upstart-job
  2. Merge into trunk.14.04
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 194
Merged at revision: 213
Proposed branch: lp:~ted/indicator-power/upstart-job
Merge into: lp:indicator-power/14.04
Diff against target: 83 lines (+44/-14)
4 files modified
data/Makefile.am (+24/-11)
data/indicator-power.conf.in (+11/-0)
data/indicator-power.desktop.in (+9/-0)
data/indicator-power.service.in (+0/-3)
To merge this branch: bzr merge lp:~ted/indicator-power/upstart-job
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+193089@code.launchpad.net

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

Description of the change

Switching DBus service to an Upstart Job.

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

PASSED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip

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

review: Approve (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:192
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/26/artifact/work/output/*zip*/output.zip

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

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

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-power-ci/66/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/Makefile.am'
2--- data/Makefile.am 2013-07-04 20:14:54 +0000
3+++ data/Makefile.am 2013-10-29 16:32:21 +0000
4@@ -10,17 +10,30 @@
5 dist_indicators_DATA = com.canonical.indicator.power
6
7 #
8-# the dbus service file
9-#
10-
11-dbus_servicesdir = $(datadir)/dbus-1/services
12-dbus_services_DATA = indicator-power.service
13-dbus_services_in = $(dbus_services_DATA:.service=.service.in)
14-$(dbus_services_DATA): $(dbus_services_in)
15- $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
16-BUILT_SOURCES += $(dbus_services_DATA)
17-CLEANFILES += $(dbus_services_DATA)
18-EXTRA_DIST += $(dbus_services_in)
19+# the upstart job file
20+#
21+
22+upstart_jobsdir = $(datadir)/upstart/sessions
23+upstart_jobs_DATA = indicator-power.conf
24+upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in)
25+$(upstart_jobs_DATA): $(upstart_jobs_in)
26+ $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
27+BUILT_SOURCES += $(upstart_jobs_DATA)
28+CLEANFILES += $(upstart_jobs_DATA)
29+EXTRA_DIST += $(upstart_jobs_in)
30+
31+#
32+# the xdg autostart job file
33+#
34+
35+xdg_autostartdir = /etc/xdg/autostart
36+xdg_autostart_DATA = indicator-power.desktop
37+xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
38+$(xdg_autostart_DATA): $(xdg_autostart_in)
39+ $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
40+BUILT_SOURCES += $(xdg_autostart_DATA)
41+CLEANFILES += $(xdg_autostart_DATA)
42+EXTRA_DIST += $(xdg_autostart_in)
43
44 #
45 # the gettings
46
47=== added file 'data/indicator-power.conf.in'
48--- data/indicator-power.conf.in 1970-01-01 00:00:00 +0000
49+++ data/indicator-power.conf.in 2013-10-29 16:32:21 +0000
50@@ -0,0 +1,11 @@
51+description "Indicator Power Backend"
52+
53+# Want to move to indicator-services-[start|end], but that's not all
54+# there yet. Use the signals that exist today for now.
55+
56+start on indicators-loaded or indicator-services-start
57+stop on desktop-end or indicator-services-end
58+
59+respawn
60+
61+exec @pkglibexecdir@/indicator-power-service
62
63=== added file 'data/indicator-power.desktop.in'
64--- data/indicator-power.desktop.in 1970-01-01 00:00:00 +0000
65+++ data/indicator-power.desktop.in 2013-10-29 16:32:21 +0000
66@@ -0,0 +1,9 @@
67+[Desktop Entry]
68+Type=Application
69+Name=Indicator Power
70+Exec=@pkglibexecdir@/indicator-power-service
71+NotShowIn=Unity;
72+NoDisplay=true
73+StartupNotify=false
74+Terminal=false
75+
76
77=== removed file 'data/indicator-power.service.in'
78--- data/indicator-power.service.in 2013-07-04 20:14:54 +0000
79+++ data/indicator-power.service.in 1970-01-01 00:00:00 +0000
80@@ -1,3 +0,0 @@
81-[D-BUS Service]
82-Name=com.canonical.indicator.power
83-Exec=@pkglibexecdir@/indicator-power-service

Subscribers

People subscribed via source and target branches