session-manager

Merge lp:~saviq/session-manager/rename-unity8 into lp:session-manager

  1. rename-unity8
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 57
Merged at revision: 57
Proposed branch: lp:~saviq/session-manager/rename-unity8
Merge into: lp:session-manager
Diff against target: 50 lines (+9/-2)
4 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
device-services (+1/-1)
ubuntu-session (+1/-1)
To merge this branch: bzr merge lp:~saviq/session-manager/rename-unity8
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+167271@code.launchpad.net

Commit message

Rename qml-phone-shell to unity8

Description of the change

Renaming qml-phone-shell to unity8.

This needs to happen in sync with lp:~unity-team/unity/phablet.rename-unity8.

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

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/session-manager-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-raring-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-raring-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins:8080/job/session-manager-ci/17/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-03 17:49:13 +0000
3+++ debian/changelog 2013-06-04 13:52:19 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-session (0.49) saucy; urgency=low
6+
7+ * Rename qml-phone-shell to unity8.
8+
9+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 04 Jun 2013 15:16:37 +0200
10+
11 ubuntu-session (0.48-0ubuntu2) saucy; urgency=low
12
13 * Releasing for saucy.
14
15=== modified file 'debian/control'
16--- debian/control 2013-02-20 18:51:47 +0000
17+++ debian/control 2013-06-04 13:52:19 +0000
18@@ -10,6 +10,7 @@
19 Architecture: all
20 Depends: ${shlibs:Depends},
21 ${misc:Depends},
22+Conflicts: qml-phone-shell (<< 7.80~)
23 Description: Ubuntu Session Manager for Mobile Devices
24 The ubuntu-session tool aims to setup a very simple session manager
25 for our mobile shell.
26
27=== modified file 'device-services'
28--- device-services 2013-05-23 21:02:48 +0000
29+++ device-services 2013-06-04 13:52:19 +0000
30@@ -1,6 +1,6 @@
31 0 pulseaudio --start --log-target=syslog
32 0 maliit-server
33-2 qml-phone-shell
34+2 unity8
35 0 chewie_messaging_populate_menu
36 0 friends-service -do
37 2 manage-address-books create
38
39=== modified file 'ubuntu-session'
40--- ubuntu-session 2013-05-23 21:02:48 +0000
41+++ ubuntu-session 2013-06-04 13:52:19 +0000
42@@ -98,7 +98,7 @@
43 $command $args >"$HOME/.ubuntu-session/logs/$command.log" 2>&1 &
44 pids="$! $pids"
45 echo "Started $command with pid $! ($delay secs start delay)"
46- if [ "$command" = "qml-phone-shell" ]; then
47+ if [ "$command" = "unity8" ]; then
48 shell_pid=$!
49 echo "Got Shell pid = $shell_pid"
50 fi

Subscribers

People subscribed via source and target branches