Merge lp:~xnox/unity-greeter/systemd-sysv-fix into lp:unity-greeter

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1463
Proposed branch: lp:~xnox/unity-greeter/systemd-sysv-fix
Merge into: lp:unity-greeter
Diff against target: 24 lines (+2/-1)
2 files modified
debian/control (+1/-0)
src/unity-greeter.vala (+1/-1)
To merge this branch: bzr merge lp:~xnox/unity-greeter/systemd-sysv-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Martin Pitt Pending
Iain Lane Pending
Unity Greeter Development Team Pending
Review via email: mp+243886@code.launchpad.net

Commit message

Port to upstart-bin (LP: #1398619)

Description of the change

Port to upstart-bin (LP: #1398619)

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

please citrain this.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2014-04-04 03:58:04 +0000
+++ debian/control 2014-12-06 02:07:30 +0000
@@ -30,6 +30,7 @@
30Architecture: any30Architecture: any
31Depends: ${misc:Depends},31Depends: ${misc:Depends},
32 ${shlibs:Depends},32 ${shlibs:Depends},
33 upstart-bin
33Recommends: unity-settings-daemon,34Recommends: unity-settings-daemon,
34 indicator-application,35 indicator-application,
35 indicator-datetime,36 indicator-datetime,
3637
=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala 2014-11-04 02:49:30 +0000
+++ src/unity-greeter.vala 2014-12-06 02:07:30 +0000
@@ -574,7 +574,7 @@
574 {574 {
575 string[] argv;575 string[] argv;
576576
577 Shell.parse_argv ("init --user --startup-event indicator-services-start", out argv);577 Shell.parse_argv ("upstart --user --startup-event indicator-services-start", out argv);
578 Process.spawn_async (null,578 Process.spawn_async (null,
579 argv,579 argv,
580 null,580 null,

Subscribers

People subscribed via source and target branches