aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2013-06-20 15:27:24 -0400
committerWilliam Hua <william.hua@canonical.com>2013-06-20 15:27:24 -0400
commit07d1ec2d7e97e43d47cb5bfd9d56df66870c6d31 (patch)
tree518ee8fc4ebde535cea51ec2bc11cfed26a5d95f
parentebce729fcd5252901eb8ff345c1050473c0c288b (diff)
downloadayatana-indicator-keyboard-07d1ec2d7e97e43d47cb5bfd9d56df66870c6d31.tar.gz
ayatana-indicator-keyboard-07d1ec2d7e97e43d47cb5bfd9d56df66870c6d31.tar.bz2
ayatana-indicator-keyboard-07d1ec2d7e97e43d47cb5bfd9d56df66870c6d31.zip
Update indicator service manifest.
-rw-r--r--data/Makefile.am14
-rw-r--r--debian/changelog6
-rw-r--r--debian/indicator-keyboard.install2
3 files changed, 15 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 009024e4..aadd619c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -39,13 +39,15 @@ indicator-keyboard.service:
mv $@.tmp $@
indicatordir = $(INDICATOR_DIR)
-dist_indicator_DATA = indicator-keyboard.indicator
+dist_indicator_DATA = com.canonical.indicator.keyboard
-indicator-keyboard.indicator:
- $(AM_V_GEN) (echo '[Indicator Service]'; \
- echo 'Name=indicator-keyboard'; \
- echo 'BusName=com.canonical.indicator.keyboard'; \
- echo 'ObjectPath=/com/canonical/indicator/keyboard') > $@.tmp && \
+com.canonical.indicator.keyboard:
+ $(AM_V_GEN) (echo '[Indicator Service]'; \
+ echo 'Name=indicator-keyboard'; \
+ echo 'ObjectPath=/com/canonical/indicator/keyboard'; \
+ echo ''; \
+ echo '[desktop]'; \
+ echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop') > $@.tmp && \
mv $@.tmp $@
EXTRA_DIST = $(dist_service_DATA) \
diff --git a/debian/changelog b/debian/changelog
index 52f92bd2..691300d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-keyboard (0.0.0-0ubuntu14) saucy; urgency=low
+
+ * Update indicator service manifest.
+
+ -- William Hua <william.hua@canonical.com> Thu, 20 Jun 2013 15:20:09 -0400
+
indicator-keyboard (0.0.0-0ubuntu13) saucy; urgency=low
* Migrate old keyboard layouts.
diff --git a/debian/indicator-keyboard.install b/debian/indicator-keyboard.install
index ac19ff03..65e98809 100644
--- a/debian/indicator-keyboard.install
+++ b/debian/indicator-keyboard.install
@@ -1,3 +1,3 @@
usr/lib/*/indicator-keyboard-service
usr/share/dbus-1/services/indicator-keyboard.service
-usr/share/unity/indicators/indicator-keyboard.indicator
+usr/share/unity/indicators/com.canonical.indicator.keyboard