Merge lp:~laney/session-migration/upstart-job into lp:session-migration

Proposed by Iain Lane
Status: Merged
Approved by: Didier Roche
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~laney/session-migration/upstart-job
Merge into: lp:session-migration
Diff against target: 56 lines (+16/-0)
5 files modified
CMakeLists.txt (+1/-0)
data/CMakeLists.txt (+1/-0)
data/session-migration.conf (+8/-0)
debian/changelog (+5/-0)
debian/session-migration.install (+1/-0)
To merge this branch: bzr merge lp:~laney/session-migration/upstart-job
Reviewer Review Type Date Requested Status
Didier Roche Approve
Ubuntu Desktop Pending
Review via email: mp+200811@code.launchpad.net

Description of the change

Add an upstart user session job so that we can run session-migration in non-gnome-session environments.

To post a comment you must log in.
Revision history for this message
Didier Roche (didrocks) wrote :

Everything looks good to me. Thanks Iain to have tackle that one!

(Maybe it will be time to put session-migration under dailies as well ;))

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-07-13 08:48:27 +0000
3+++ CMakeLists.txt 2014-01-08 11:45:33 +0000
4@@ -4,6 +4,7 @@
5 find_package (PkgConfig)
6 pkg_check_modules (CACHED_SESSIONMIGRATION_DEPS REQUIRED "glib-2.0;gio-2.0")
7
8+add_subdirectory(data)
9 add_subdirectory(src)
10
11 file(COPY debhelper tests
12
13=== added directory 'data'
14=== added file 'data/CMakeLists.txt'
15--- data/CMakeLists.txt 1970-01-01 00:00:00 +0000
16+++ data/CMakeLists.txt 2014-01-08 11:45:33 +0000
17@@ -0,0 +1,1 @@
18+install (FILES session-migration.conf DESTINATION share/upstart/sessions)
19
20=== added file 'data/session-migration.conf'
21--- data/session-migration.conf 1970-01-01 00:00:00 +0000
22+++ data/session-migration.conf 2014-01-08 11:45:33 +0000
23@@ -0,0 +1,8 @@
24+description "Session Migration"
25+author "Iain Lane <iain.lane@canonical.com>"
26+
27+start on (started dbus and starting xsession-init)
28+
29+task
30+
31+exec session-migration
32
33=== modified file 'debian/changelog'
34--- debian/changelog 2012-07-20 16:31:29 +0000
35+++ debian/changelog 2014-01-08 11:45:33 +0000
36@@ -1,7 +1,12 @@
37 session-migration (0.2.1) UNRELEASED; urgency=low
38
39+ [ Didier Roche ]
40 * add more info to the manpage
41
42+ [ Iain Lane ]
43+ * Add an upstart user session script, so we can run session-migration under
44+ more types of session.
45+
46 -- Didier Roche <didrocks@ubuntu.com> Fri, 20 Jul 2012 18:31:16 +0200
47
48 session-migration (0.2) quantal; urgency=low
49
50=== modified file 'debian/session-migration.install'
51--- debian/session-migration.install 2012-07-13 12:16:24 +0000
52+++ debian/session-migration.install 2014-01-08 11:45:33 +0000
53@@ -1,2 +1,3 @@
54 usr/bin/session-migration
55+usr/share/upstart/sessions
56 usr/share/man/*/session-migration*

Subscribers

People subscribed via source and target branches

to all changes: