Merge lp:~xnox/indicator-session/ubiquity into lp:indicator-session/14.04

[Dimitri John Ledkov]

Define "ubiquity" indicator profile, reusing the greeter object. (LP: #1241539)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:416
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/42/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-session-ci/104/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Thanks.

review: Approve

=== modified file 'data/com.canonical.indicator.session'
--- data/com.canonical.indicator.session	2013-07-05 12:24:39 +0000
+++ data/com.canonical.indicator.session	2013-10-18 12:19:47 +0000
@@ -9,3 +9,5 @@
 [desktop_greeter]
 ObjectPath=/com/canonical/indicator/session/desktop_greeter
 
+[ubiquity]
+ObjectPath=/com/canonical/indicator/session/desktop_greeter

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-04 02:30:51 +0000
+++ debian/changelog	2013-10-18 12:19:47 +0000
@@ -1,3 +1,10 @@
+indicator-session (12.10.5+13.10.20131004-0ubuntu2) UNRELEASED; urgency=low
+
+  * Define "ubiquity" indicator profile, reusing the greeter object. (LP:
+    #1241539)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Fri, 18 Oct 2013 13:18:38 +0100
+
 indicator-session (12.10.5+13.10.20131004-0ubuntu1) saucy; urgency=low
 
   [ Charles Kerr ]