summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2009-06-01 12:43:49 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2009-06-01 15:48:36 +0100
commitea678a8426ab1dac34b169292e1d22a17c1d94c8 (patch)
treef60ea2fae1b398b8622f4ea50c62f31bec14c0d2 /server
parentabefea64785ea735e1f833b4f0fad78e8b064fdb (diff)
Change MC's bus name to end with MissionControl5
This is a step towards having MC 4 and MC 5 parallel-installable, which will be useful for development.
Diffstat (limited to 'server')
-rw-r--r--server/Makefile.am6
-rw-r--r--server/org.freedesktop.Telepathy.MissionControl5.service.in (renamed from server/org.freedesktop.Telepathy.MissionControl.service.in)2
2 files changed, 4 insertions, 4 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index 71f826c2..1e88965d 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -6,13 +6,13 @@ INCLUDES = $(DBUS_CFLAGS) $(TELEPATHY_CFLAGS) -I$(top_srcdir) \
if HAVE_SERVER
-EXTRA_DIST = org.freedesktop.Telepathy.MissionControl.service.in \
+EXTRA_DIST = org.freedesktop.Telepathy.MissionControl5.service.in \
org.freedesktop.Telepathy.AccountManager.service.in
-CLEANFILES = org.freedesktop.Telepathy.MissionControl.service \
+CLEANFILES = org.freedesktop.Telepathy.MissionControl5.service \
org.freedesktop.Telepathy.AccountManager.service
servicefiledir=$(prefix)/share/dbus-1/services
-servicefile_DATA=org.freedesktop.Telepathy.MissionControl.service \
+servicefile_DATA=org.freedesktop.Telepathy.MissionControl5.service \
org.freedesktop.Telepathy.AccountManager.service
%.service: %.service.in Makefile
diff --git a/server/org.freedesktop.Telepathy.MissionControl.service.in b/server/org.freedesktop.Telepathy.MissionControl5.service.in
index f27d568f..1d6785e5 100644
--- a/server/org.freedesktop.Telepathy.MissionControl.service.in
+++ b/server/org.freedesktop.Telepathy.MissionControl5.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.freedesktop.Telepathy.MissionControl
+Name=org.freedesktop.Telepathy.MissionControl5
Exec=@libexecdir@/mission-control