Re-namespace bus names, and bump version to "Mission Control 6"

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54879
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

22 files changed, 58 insertions, 56 deletions

diff --git a/.gitignore b/.gitignore
index c3abe8e7..adcbe6d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,13 +70,13 @@ mission-control.pc
 /mission-control-plugins-uninstalled.pc
 patches/
 stamp-*
-/server/mission-control-5
-/server/mission-control-5.8
-/server/org.freedesktop.Telepathy.AccountManager.service
-/server/org.freedesktop.Telepathy.MissionControl5.service
+/server/mission-control-6
+/server/mission-control-6.8
+/server/im.telepathy1.AccountManager.service
+/server/im.telepathy1.MissionControl6.service
 tags
 TAGS
-/telepathy-mission-control-5*
+/telepathy-mission-control-[56]*
 /test-driver
 /tests/account-store
 /tests/keyring-command
diff --git a/README b/README
index fe20bc46..59540428 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 ===========================
-telepathy-mission-control 5
+telepathy-mission-control 6
 ===========================
 
-Telepathy Mission Control 5 is an account manager and channel dispatcher for
+Telepathy Mission Control 6 is an account manager and channel dispatcher for
 the Telepathy framework, allowing user interfaces and other clients
 to share connections to real-time communication services without conflicting.
 It implements the AccountManager and ChannelDispatcher D-Bus APIs as described
@@ -115,7 +115,7 @@ The current development version of MC is available from the
   <http://git.collabora.co.uk/?p=telepathy-mission-control.git> (gitweb)
 
 Stable branches will be made available from branches with names like
-'telepathy-mission-control-5.2' in the same repository.
+'telepathy-mission-control-6.0' in the same repository.
 
 Contributions for review should be attached to bugs in freedesktop.org
 Bugzilla, with the "patch" tag. If there's no relevant bug, open one:
diff --git a/configure.ac b/configure.ac
index d6ceca62..a3d9d2bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Set the version number to e.g. 5.x.y immediately before a release.
 dnl Set the version number to e.g. 5.x.y+ immediately after (this will
 dnl enable -Werror).
-AC_INIT([telepathy-mission-control], [5.16.99+])
+AC_INIT([telepathy-mission-control], [5.99.0+])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/mission-control-plugins-uninstalled.pc.in b/mission-control-plugins-uninstalled.pc.in
index 25540454..b7e97412 100644
--- a/mission-control-plugins-uninstalled.pc.in
+++ b/mission-control-plugins-uninstalled.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 MCP_API_VERSION=@MCP_API_VERSION@
 MCP_ABI_VERSION=@MCP_ABI_VERSION@
 plugindir=${libdir}/mission-control-plugins.@MCP_ABI_VERSION@
-missioncontrolpath=${libexecdir}/mission-control-5
+missioncontrolpath=${libexecdir}/mission-control-6
 abs_top_srcdir=@abs_top_srcdir@
 abs_top_builddir=@abs_top_builddir@
 
diff --git a/server/Makefile.am b/server/Makefile.am
index b18a442b..2bc2291a 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -10,16 +10,18 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(ERROR_CFLAGS)
 
-EXTRA_DIST = org.freedesktop.Telepathy.MissionControl5.service.in \
-	     org.freedesktop.Telepathy.AccountManager.service.in \
-	     mission-control-5.8.in
-CLEANFILES = org.freedesktop.Telepathy.MissionControl5.service \
-	     org.freedesktop.Telepathy.AccountManager.service \
-	     mission-control-5.8
+EXTRA_DIST = im.telepathy1.MissionControl6.service.in \
+	     im.telepathy1.AccountManager.service.in \
+	     mission-control-6.8.in
+CLEANFILES = im.telepathy1.MissionControl6.service \
+	     im.telepathy1.AccountManager.service \
+	     mission-control-6.8
 
 servicefiledir=$(prefix)/share/dbus-1/services
-servicefile_DATA=org.freedesktop.Telepathy.MissionControl5.service \
-		 org.freedesktop.Telepathy.AccountManager.service
+servicefile_DATA= \
+	im.telepathy1.MissionControl6.service \
+	im.telepathy1.AccountManager.service \
+	$(NULL)
 
 %.service: %.service.in Makefile
 	$(AM_V_GEN)sed \
@@ -27,14 +29,14 @@ servicefile_DATA=org.freedesktop.Telepathy.MissionControl5.service \
 		-e 's![@]bindir[@]!$(bindir)!' \
 		$< > $@
 
-man8_MANS = mission-control-5.8
+man8_MANS = mission-control-6.8
 
 %.8: %.8.in Makefile
 	$(AM_V_GEN)sed -e 's![@]libexecdir[@]!$(libexecdir)!' $< > $@
 
-libexec_PROGRAMS = mission-control-5
-mission_control_5_SOURCES = mc-server.c
-mission_control_5_LDADD = \
+libexec_PROGRAMS = mission-control-6
+mission_control_6_SOURCES = mc-server.c
+mission_control_6_LDADD = \
 	$(GLIB_LIBS) \
 	$(TELEPATHY_LIBS) \
 	$(DBUS_LIBS) \
@@ -43,13 +45,13 @@ mission_control_5_LDADD = \
 
 Android.mk: Makefile.am
 	androgenizer -:PROJECT telepathy-mission-control \
-	 -:SHARED libmission-control-5 -:TAGS eng debug \
+	 -:SHARED libmission-control-6 -:TAGS eng debug \
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(mission_control_5_SOURCES) \
+	 -:SOURCES $(mission_control_6_SOURCES) \
 	 -:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \
 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
 	  -DBUILD_AS_ANDROID_SERVICE \
-	 -:LDFLAGS $(mission_control_5_LDADD) \
+	 -:LDFLAGS $(mission_control_6_LDADD) \
 	 -:LIBFILTER_STATIC mcd-convenience mission-control-plugins \
 	  mcclient \
 	> $@
diff --git a/server/im.telepathy1.AccountManager.service.in b/server/im.telepathy1.AccountManager.service.in
new file mode 100644
index 00000000..5568ff21
--- /dev/null
+++ b/server/im.telepathy1.AccountManager.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=im.telepathy1.AccountManager
+Exec=@libexecdir@/mission-control-6
diff --git a/server/im.telepathy1.MissionControl6.service.in b/server/im.telepathy1.MissionControl6.service.in
new file mode 100644
index 00000000..61acc254
--- /dev/null
+++ b/server/im.telepathy1.MissionControl6.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=im.telepathy1.MissionControl6
+Exec=@bindir@/mc-wait-for-name --activate im.telepathy1.AccountManager im.telepathy1.MissionControl6
diff --git a/server/mission-control-5.8.in b/server/mission-control-6.8.in
index b57361a1..3bb6b4e9 100644
--- a/server/mission-control-5.8.in
+++ b/server/mission-control-6.8.in
@@ -1,13 +1,13 @@
-.TH MISSION-CONTROL-5 "8" "July 2009" "Telepathy" "D-Bus services"
+.TH MISSION-CONTROL-6 "8" "July 2009" "Telepathy" "D-Bus services"
 \" Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/>
 \" This document may be distributed under the same terms as
 \" telepathy-mission-control itself.
 .SH NAME
-mission-control-5 \- Telepathy account manager/chanel dispatcher
+mission-control-6 \- Telepathy account manager/chanel dispatcher
 .SH SYNOPSIS
-\fB@libexecdir@/mission\-control\-5\fR
+\fB@libexecdir@/mission\-control\-6\fR
 .SH DESCRIPTION
-Mission Control 5 implements the AccountManager and ChannelDispatcher services
+Mission Control 6 implements the AccountManager and ChannelDispatcher services
 described in the Telepathy D-Bus specification, allowing clients like
 .BR empathy (1)
 to store account details, connect to accounts, request communication channels,
diff --git a/server/org.freedesktop.Telepathy.AccountManager.service.in b/server/org.freedesktop.Telepathy.AccountManager.service.in
deleted file mode 100644
index c137820b..00000000
--- a/server/org.freedesktop.Telepathy.AccountManager.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.AccountManager
-Exec=@libexecdir@/mission-control-5
diff --git a/server/org.freedesktop.Telepathy.MissionControl5.service.in b/server/org.freedesktop.Telepathy.MissionControl5.service.in
deleted file mode 100644
index 51f4dc17..00000000
--- a/server/org.freedesktop.Telepathy.MissionControl5.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.MissionControl5
-Exec=@bindir@/mc-wait-for-name --activate org.freedesktop.Telepathy.AccountManager org.freedesktop.Telepathy.MissionControl5
diff --git a/src/mcd-service.c b/src/mcd-service.c
index 17c94b04..37232593 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -57,7 +57,7 @@
 #include "mcd-service.h"
 
 /* DBus service specifics */
-#define MISSION_CONTROL_DBUS_SERVICE "org.freedesktop.Telepathy.MissionControl5"
+#define MISSION_CONTROL_DBUS_SERVICE "im.telepathy1.MissionControl6"
 
 static GObjectClass *parent_class = NULL;
 
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 00e67292..7c9d91d3 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -235,7 +235,7 @@ installcheck-local: installcheck-twisted
 installcheck-twisted:
 	$(MAKE) check-twisted \
 		TWISTED_SPECIAL_BUILD_TESTS= \
-		MC_EXECUTABLE=$(DESTDIR)@libexecdir@/mission-control-5
+		MC_EXECUTABLE=$(DESTDIR)@libexecdir@/mission-control-6
 
 endif # WANT_TWISTED_TESTS
 
diff --git a/tests/twisted/mctest.py b/tests/twisted/mctest.py
index fe774c95..025f87fc 100644
--- a/tests/twisted/mctest.py
+++ b/tests/twisted/mctest.py
@@ -1275,7 +1275,7 @@ def tell_mc_to_die(q, bus):
     # Make sure MC exits
     q.expect('dbus-signal', signal='NameOwnerChanged',
         predicate=(lambda e:
-            e.args[0] == 'org.freedesktop.Telepathy.AccountManager' and
+            e.args[0] == 'im.telepathy1.AccountManager' and
             e.args[2] == ''))
 
 def resuscitate_mc(q, bus, mc):
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index 9eb17c79..1645270d 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -37,14 +37,14 @@ servicedir-installed/%.conf: servicedir-installed/%.conf.in Makefile
 # We don't use the full filename for the .in because > 99 character filenames
 # in tarballs are non-portable (and automake 1.8 doesn't let us build
 # non-archaic tarballs)
-servicedir-uninstalled/org.freedesktop.Telepathy.%.service: servicedir-uninstalled/%.service.in Makefile
+servicedir-uninstalled/im.telepathy1.%.service: servicedir-uninstalled/%.service.in Makefile
 	$(AM_V_at)$(MKDIR_P) servicedir-uninstalled
 	$(AM_V_GEN)sed \
 		-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" \
 		-e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
 		$< > $@
 
-servicedir-installed/org.freedesktop.Telepathy.%.service: servicedir-installed/%.service.in Makefile
+servicedir-installed/im.telepathy1.%.service: servicedir-installed/%.service.in Makefile
 	$(AM_V_at)$(MKDIR_P) servicedir-installed
 	$(AM_V_GEN)sed \
 		-e "s|[@]mctestsdir[@]|@mctestsdir@|g" \
@@ -52,15 +52,15 @@ servicedir-installed/org.freedesktop.Telepathy.%.service: servicedir-installed/%
 
 # D-Bus service file for testing
 uninstalled_service_in_files = \
-	servicedir-uninstalled/MissionControl5.service.in \
+	servicedir-uninstalled/MissionControl6.service.in \
 	servicedir-uninstalled/Client.AbiWord.service.in \
 	servicedir-uninstalled/Client.Logger.service.in
-uninstalled_service_files = $(patsubst servicedir-uninstalled/%.in,servicedir-uninstalled/org.freedesktop.Telepathy.%, $(uninstalled_service_in_files))
+uninstalled_service_files = $(patsubst servicedir-uninstalled/%.in,servicedir-uninstalled/im.telepathy1.%, $(uninstalled_service_in_files))
 installed_service_in_files = \
-	servicedir-installed/MissionControl5.service.in \
+	servicedir-installed/MissionControl6.service.in \
 	servicedir-installed/Client.AbiWord.service.in \
 	servicedir-installed/Client.Logger.service.in
-installed_service_files = $(patsubst servicedir-installed/%.in,servicedir-installed/org.freedesktop.Telepathy.%, $(installed_service_in_files))
+installed_service_files = $(patsubst servicedir-installed/%.in,servicedir-installed/im.telepathy1.%, $(installed_service_in_files))
 
 # D-Bus config file for testing
 uninstalled_conf_in_files = servicedir-uninstalled/tmp-session-bus.conf.in
diff --git a/tests/twisted/tools/run-mc.sh.in b/tests/twisted/tools/run-mc.sh.in
index 4c7528f3..88b951ec 100755
--- a/tests/twisted/tools/run-mc.sh.in
+++ b/tests/twisted/tools/run-mc.sh.in
@@ -24,4 +24,4 @@ ln -f ${MC_TEST_LOG_DIR}/missioncontrol-$$.log missioncontrol.log
 DBUS_SYSTEM_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS"
 export DBUS_SYSTEM_BUS_ADDRESS
 
-@libexecdir@/mission-control-5
+@libexecdir@/mission-control-6
diff --git a/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in b/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in
index 219461ee..3bd13e5d 100644
--- a/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in
+++ b/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.AbiWord
-Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.AbiWord
+Name=im.telepathy1.Client.AbiWord
+Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh im.telepathy1.Client.AbiWord
diff --git a/tests/twisted/tools/servicedir-installed/Client.Logger.service.in b/tests/twisted/tools/servicedir-installed/Client.Logger.service.in
index 67f07942..393320c8 100644
--- a/tests/twisted/tools/servicedir-installed/Client.Logger.service.in
+++ b/tests/twisted/tools/servicedir-installed/Client.Logger.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.Logger
-Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.Logger
+Name=im.telepathy1.Client.Logger
+Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh im.telepathy1.Client.Logger
diff --git a/tests/twisted/tools/servicedir-installed/MissionControl5.service.in b/tests/twisted/tools/servicedir-installed/MissionControl6.service.in
index db016b11..91a7028a 100644
--- a/tests/twisted/tools/servicedir-installed/MissionControl5.service.in
+++ b/tests/twisted/tools/servicedir-installed/MissionControl6.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.MissionControl5
+Name=im.telepathy1.MissionControl6
 Exec=@mctestsdir@/twisted/tools/run-mc.sh
diff --git a/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in b/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in
index 300bd5b0..69ff9e62 100644
--- a/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in
+++ b/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.AbiWord
-Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.AbiWord
+Name=im.telepathy1.Client.AbiWord
+Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh im.telepathy1.Client.AbiWord
diff --git a/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in b/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in
index 9fd4bfb1..07ad47d5 100644
--- a/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in
+++ b/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.Logger
-Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.Logger
+Name=im.telepathy1.Client.Logger
+Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh im.telepathy1.Client.Logger
diff --git a/tests/twisted/tools/servicedir-uninstalled/MissionControl5.service.in b/tests/twisted/tools/servicedir-uninstalled/MissionControl6.service.in
index e8f41c41..ffa067a2 100644
--- a/tests/twisted/tools/servicedir-uninstalled/MissionControl5.service.in
+++ b/tests/twisted/tools/servicedir-uninstalled/MissionControl6.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.MissionControl5
+Name=im.telepathy1.MissionControl6
 Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh
diff --git a/util/wait-for-name.c b/util/wait-for-name.c
index 13f2f5bd..f9abaa2f 100644
--- a/util/wait-for-name.c
+++ b/util/wait-for-name.c
@@ -16,7 +16,7 @@
  *
  * [D-BUS Service]
  * Name=....AccountManager
- * Exec=/usr/lib/telepathy/mc-wait-for-name --activate ....MissionControl5 ....AccountManager
+ * Exec=/usr/lib/telepathy/mc-wait-for-name --activate ....MissionControl6 ....AccountManager
  *
  * Copyright (C) 2009 Nokia Corporation
  * Copyright (C) 2009, 2012 Collabora Ltd.