Merge lp:~xnox/indicator-keyboard/ubiquity into lp:indicator-keyboard

[Dimitri John Ledkov]

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:144
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/32/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/32/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-keyboard-ci/32/rebuild

review: Needs Fixing (continuous-integration)

[lp:~xnox/indicator-keyboard/ubiquity]

145. By Dimitri John Ledkov on 2013-10-18

Fixup

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/33/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-keyboard-ci/33/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Thanks.

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-08-07 20:20:23 +0000
+++ data/Makefile.am	2013-10-18 14:21:04 +0000
@@ -51,6 +51,9 @@
 	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop';             \
 	             echo '';                                                                 \
 	             echo '[desktop_greeter]';                                                \
+	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop';             \
+	             echo '';                                                                 \
+	             echo '[ubiquity]';                                                       \
 	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop') > $@.tmp && \
 	            mv $@.tmp $@
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-10 12:36:10 +0000
+++ debian/changelog	2013-10-18 14:21:04 +0000
@@ -1,3 +1,10 @@
+indicator-keyboard (0.0.0+13.10.20131010.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * Define "ubiquity" indicator profile, reusing the greeter object. (LP:
+    #1241539)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Fri, 18 Oct 2013 13:22:18 +0100
+
 indicator-keyboard (0.0.0+13.10.20131010.1-0ubuntu1) saucy; urgency=low
 
   [ William Hua ]