Merge lp:~mzanetti/session-manager/lauch-shell-later into lp:session-manager

[Michael Zanetti]

increase time before running the shell to decrease likelyhood of the connection to maliit failing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~mzanetti/session-manager/lauch-shell-later]

53. By Michael Zanetti on 2013-04-19

add bug number to changelog

[Sergio Schvezov (sergiusens)]

the bug needs to be formatted with LP: #1157508

So
7 + * increase time before running the shell to decrease likelyhood of the connection to maliit failing (Bug 1157508)

would be
7 + * increase time before running the shell to decrease likelyhood of the connection to maliit failing (LP: #1157508)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~mzanetti/session-manager/lauch-shell-later]

54. By Michael Zanetti on 2013-04-19

fix changelog

55. By Michael Zanetti on 2013-04-19

really fix changelog

[Sergio Schvezov (sergiusens)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-03 16:12:23 +0000
+++ debian/changelog	2013-04-19 14:45:31 +0000
@@ -1,3 +1,10 @@
+ubuntu-session (0.46) quantal; urgency=low
+
+  * increase time before running the shell to decrease likelyhood of the
+    connection to maliit failing (LP: #1157508)
+
+ -- Michael Zanetti <[e-mail]>  Fri, 19 Apr 2013 15:55:06 +0200
+
 ubuntu-session (0.45) quantal; urgency=low
 
   [ András Mamenyák ]

=== modified file 'tablet-services'
--- tablet-services	2013-01-11 23:17:40 +0000
+++ tablet-services	2013-04-19 14:45:31 +0000
@@ -1,6 +1,6 @@
 0   pulseaudio --start --log-target=syslog
 0   maliit-server
-2   qml-phone-shell
+4   qml-phone-shell
 0   chewie_messaging_populate_menu
 0   friends-service -do
 2   manage-address-books.py create