Merge lp:~sergiusens/session-manager/time-to-shell into lp:session-manager

[Sergio Schvezov]

Reverting change on shell launch timing as it caused people lens to fail

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/session-manager-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-quantal-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-quantal-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-raring-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-raring-i386-ci/9

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

review: Approve

[Ricardo Salveti (rsalveti)]

Good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-19 14:41:53 +0000
+++ debian/changelog	2013-04-20 12:49:24 +0000
@@ -1,3 +1,9 @@
+ubuntu-session (0.47) quantal; urgency=low
+
+  * Reverting change made on 0.46 as it causes other sync issues.
+
+ -- Sergio Schvezov <[e-mail]>  Sat, 20 Apr 2013 09:46:24 -0300
+
 ubuntu-session (0.46) quantal; urgency=low
 
   * increase time before running the shell to decrease likelyhood of the

=== modified file 'tablet-services'
--- tablet-services	2013-04-19 13:56:12 +0000
+++ tablet-services	2013-04-20 12:49:24 +0000
@@ -1,6 +1,6 @@
 0   pulseaudio --start --log-target=syslog
 0   maliit-server
-4   qml-phone-shell
+2   qml-phone-shell
 0   chewie_messaging_populate_menu
 0   friends-service -do
 2   manage-address-books.py create