Indicator Date and Time

Merge lp://qastaging/~ted/indicator-datetime/upstart-job into lp://qastaging/~indicator-applet-developers/indicator-datetime/trunk.13.10

  1. upstart-job
  2. Merge into trunk.13.10
Proposed by Ted Gould
Status: Superseded
Proposed branch: lp://qastaging/~ted/indicator-datetime/upstart-job
Merge into: lp://qastaging/~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 1793 lines (+1169/-185) (has conflicts)
17 files modified
.bzrignore (+2/-0)
data/Makefile.am (+24/-11)
data/com.canonical.indicator.datetime (+3/-0)
data/indicator-datetime.conf.in (+8/-0)
data/indicator-datetime.desktop.in (+9/-0)
data/indicator-datetime.service.in (+0/-3)
debian/indicator-datetime.install (+2/-1)
src/Makefile.am (+4/-0)
src/clock-live.c (+281/-0)
src/clock-live.h (+73/-0)
src/clock.c (+110/-0)
src/clock.h (+76/-0)
src/datetime-prefs-locations.c (+3/-1)
src/main.c (+38/-1)
src/service.c (+515/-166)
src/service.h (+21/-0)
src/timezone.h (+0/-2)
Path conflict: <deleted> / tests/planner-mock.c
Path conflict: <deleted> / tests/planner-mock.h
Text conflict in src/main.c
Text conflict in src/service.c
Text conflict in src/service.h
To merge this branch: bzr merge lp://qastaging/~ted/indicator-datetime/upstart-job
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Indicator Applet Developers Pending
Review via email: mp+182463@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2013-10-29.

Commit message

Upstart Job

Description of the change

Upstart Job

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

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/39/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for the work, similar to https://code.launchpad.net/~ted/indicator-session/upstart-job/+merge/166373 ... why do we need to export the env and do we need that to land this cycle?

lp://qastaging/~ted/indicator-datetime/upstart-job updated
253. By Ted Gould

Dropping debugging for system-wide support

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

PASSED: Continuous integration, rev:253
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/85/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/40/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
lp://qastaging/~ted/indicator-datetime/upstart-job updated
254. By Ted Gould

Merge trunk

255. By Ted Gould

Add in support for XDG Autostart

256. By Ted Gould

Install the autostart file

257. By Ted Gould

Ignore generated files

258. By Ted Gould

Merge trunk

259. By Ted Gould

Autostart directory

Unmerged revisions

259. By Ted Gould

Autostart directory

258. By Ted Gould

Merge trunk

257. By Ted Gould

Ignore generated files

256. By Ted Gould

Install the autostart file

255. By Ted Gould

Add in support for XDG Autostart

254. By Ted Gould

Merge trunk

253. By Ted Gould

Dropping debugging for system-wide support

252. By Ted Gould

Adding into the package

251. By Ted Gould

Adding the upstart job configuration

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches