The Sync Menu

Merge lp:~ted/indicator-sync/upstart-job into lp:indicator-sync

  1. upstart-job
  2. Merge into trunk.14.04
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 40
Merged at revision: 40
Proposed branch: lp:~ted/indicator-sync/upstart-job
Merge into: lp:indicator-sync
Diff against target: 102 lines (+38/-24)
6 files modified
configure.ac (+0/-11)
data/Makefile.am (+19/-9)
data/indicator-sync.conf.in (+8/-0)
data/indicator-sync.desktop.in (+9/-0)
data/indicator-sync.service.in (+0/-3)
debian/indicator-sync.install (+2/-1)
To merge this branch: bzr merge lp:~ted/indicator-sync/upstart-job
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+193086@code.launchpad.net

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

Description of the change

Upstart jobs

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:37
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-saucy-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sync-saucy-armhf-ci/1/artifact/work/output/*zip*/output.zip

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

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

PASSED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sync-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-sync-ci/34/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 'configure.ac'
2--- configure.ac 2013-01-22 20:14:33 +0000
3+++ configure.ac 2013-10-29 16:21:38 +0000
4@@ -130,17 +130,6 @@
5 fi
6 AC_SUBST(INDICATORDIR)
7
8-###########################
9-# DBus Service Info
10-###########################
11-
12-if test "x$with_localinstall" = "xyes"; then
13- DBUSSERVICEDIR="${datadir}/dbus-1/services/"
14-else
15- DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
16-fi
17-AC_SUBST(DBUSSERVICEDIR)
18-
19 ##############################
20 # Custom Junk
21 ##############################
22
23=== modified file 'data/Makefile.am'
24--- data/Makefile.am 2012-09-13 15:27:10 +0000
25+++ data/Makefile.am 2013-10-29 16:21:38 +0000
26@@ -1,11 +1,21 @@
27 SUBDIRS = icons
28
29-dbus_servicesdir = $(DBUSSERVICEDIR)
30-dbus_services_DATA = indicator-sync.service
31-
32-%.service: %.service.in
33- sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
34-
35-EXTRA_DIST = indicator-sync.service.in
36-
37-CLEANFILES = indicator-sync.service
38+upstart_jobsdir = $(datadir)/upstart/sessions
39+upstart_jobs_DATA = indicator-sync.conf
40+
41+%.conf: %.conf.in
42+ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
43+
44+xdg_autostartdir = /etc/xdg/autostart
45+xdg_autostart_DATA = indicator-sync.conf
46+
47+%.desktop: %.desktop.in
48+ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
49+
50+EXTRA_DIST = \
51+ indicator-sync.desktop.in \
52+ indicator-sync.conf.in
53+
54+CLEANFILES = \
55+ indicator-sync.desktop \
56+ indicator-sync.conf
57
58=== added file 'data/indicator-sync.conf.in'
59--- data/indicator-sync.conf.in 1970-01-01 00:00:00 +0000
60+++ data/indicator-sync.conf.in 2013-10-29 16:21:38 +0000
61@@ -0,0 +1,8 @@
62+description "Indicator Sync Backend"
63+
64+start on indicators-loaded or indicator-services-start
65+stop on desktop-end or indicator-services-end
66+
67+respawn
68+
69+exec @pkglibexecdir@/indicator-sync-service
70
71=== added file 'data/indicator-sync.desktop.in'
72--- data/indicator-sync.desktop.in 1970-01-01 00:00:00 +0000
73+++ data/indicator-sync.desktop.in 2013-10-29 16:21:38 +0000
74@@ -0,0 +1,9 @@
75+[Desktop Entry]
76+Type=Application
77+Name=Indicator Sync
78+Exec=@pkglibexecdir@/indicator-sync-service
79+NotShowIn=Unity;
80+NoDisplay=true
81+StartupNotify=false
82+Terminal=false
83+
84
85=== removed file 'data/indicator-sync.service.in'
86--- data/indicator-sync.service.in 2012-09-13 15:27:10 +0000
87+++ data/indicator-sync.service.in 1970-01-01 00:00:00 +0000
88@@ -1,3 +0,0 @@
89-[D-BUS Service]
90-Name=com.canonical.indicator.sync
91-Exec=@pkglibexecdir@/indicator-sync-service
92
93=== modified file 'debian/indicator-sync.install'
94--- debian/indicator-sync.install 2012-11-19 15:45:51 +0000
95+++ debian/indicator-sync.install 2013-10-29 16:21:38 +0000
96@@ -1,4 +1,5 @@
97-usr/share/dbus-1
98+usr/share/upstart/sessions/*
99 usr/share/icons
100 usr/lib/indicators3
101 usr/lib/*/indicator-sync/indicator-sync-service
102+etc/xdg/autostart/*

Subscribers

People subscribed via source and target branches