The Sound Menu

Merge lp://qastaging/~ted/indicator-sound/upstart-job into lp://qastaging/indicator-sound/13.10

  1. upstart-job
  2. Merge into trunk.13.10
Proposed by Ted Gould
Status: Superseded
Proposed branch: lp://qastaging/~ted/indicator-sound/upstart-job
Merge into: lp://qastaging/indicator-sound/13.10
Diff against target: 450 lines (+182/-62) (has conflicts)
10 files modified
.bzrignore (+1/-1)
data/CMakeLists.txt (+37/-17)
data/com.canonical.indicator.sound (+7/-0)
data/indicator-sound.conf.in (+11/-0)
data/indicator-sound.desktop.in (+9/-0)
data/indicator-sound.service.in (+0/-3)
debian/changelog (+7/-0)
src/service.vala (+11/-13)
src/sound-menu.vala (+70/-13)
src/volume-control.vala (+29/-15)
Text conflict in src/sound-menu.vala
To merge this branch: bzr merge lp://qastaging/~ted/indicator-sound/upstart-job
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Needs Fixing
Review via email: mp+174442@code.qastaging.launchpad.net

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

Commit message

Switch from D-Bus activation to Upstart User Session

Description of the change

Switching around the config files.

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

PASSED: Continuous integration, rev:355
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/11

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

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Needs to be synced with pete's cmake changes.

Ted, why didn't you do that when you submitted this MP in mid-July? ;-)

review: Needs Fixing
lp://qastaging/~ted/indicator-sound/upstart-job updated
356. By Ted Gould

Merge Trunk

Revision history for this message
Ted Gould (ted) wrote :

On Tue, 2013-08-27 at 14:42 +0000, Charles Kerr wrote:

> Needs to be synced with pete's cmake changes.
>
> Ted, why didn't you do that when you submitted this MP in mid-July? ;-)

Sorry forgot to push the last version ;-) Fixed.

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

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

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

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

Dropping debugging for system-wide support

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

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

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

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

Merge trunk

359. By Ted Gould

Adding an XDG Autostart file

360. By Ted Gould

Forgot a var

Unmerged revisions

360. By Ted Gould

Forgot a var

359. By Ted Gould

Adding an XDG Autostart file

358. By Ted Gould

Merge trunk

357. By Ted Gould

Dropping debugging for system-wide support

356. By Ted Gould

Merge Trunk

355. By Ted Gould

Fixing directory

354. By Ted Gould

Switch from being dbus activated to being an upstart job

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