Merge lp:~ogra/media-hub/do-not-start-on-desktop into lp:media-hub

[Oliver Grawert]

only start on real touch sessions

make sure media-hub-server only starts in true ubuntu-touch sessions (not on the new unity8 desktop session for example)

[Jim Hodapp (jhodapp)]

Looks good, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/media-hub-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/64/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-07 10:49:50 +0000
+++ debian/changelog	2014-05-20 09:55:11 +0000
@@ -1,3 +1,11 @@
+media-hub (0.0.2+14.10.20140520-0ubuntu1) UNRELEASED; urgency=low
+
+  * make sure media-hub-server only starts on real ubuntu-touch sessions (i.e.
+    not in the new unity8 desktop session which lacks the codecs)
+    (LP: 1321204)
+
+ -- Oliver Grawert <[e-mail]>  Tue, 20 May 2014 11:51:57 +0200
+
 media-hub (0.0.2+14.10.20140507-0ubuntu1) utopic; urgency=medium
 
   [ Ricardo Mendoza ]

=== modified file 'debian/media-hub.conf'
--- debian/media-hub.conf	2014-04-30 01:12:43 +0000
+++ debian/media-hub.conf	2014-05-20 09:55:11 +0000
@@ -1,6 +1,6 @@
 description "Starts the media-hub service"
 
-start on started dbus
+start on started dbus and xsession SESSION=ubuntu-touch
 stop on runlevel [06]
 
 respawn