examples: use telepathy-1-example-* naming convention

This prevents them from colliding with installable examples from
telepathy-0.

Similarly, install their .manager files to the expected place
for telepathy-1 (DATADIR/telepathy-1, not DATADIR/telepathy).

Reviewed-by: Xavier Claessens

9 files changed, 63 insertions, 63 deletions

diff --git a/examples/client/Makefile.am b/examples/client/Makefile.am
index 9e0987b00..bacb0f61b 100644
--- a/examples/client/Makefile.am
+++ b/examples/client/Makefile.am
@@ -2,41 +2,41 @@ SUBDIRS = stream-tubes dbus-tubes python js
 
 EXAMPLES =
 
-EXAMPLES += telepathy-example-inspect-channel
-telepathy_example_inspect_channel_SOURCES = inspect-channel.c
+EXAMPLES += telepathy-1-example-inspect-channel
+telepathy_1_example_inspect_channel_SOURCES = inspect-channel.c
 
-EXAMPLES += telepathy-example-inspect-connection
-telepathy_example_inspect_connection_SOURCES = inspect-connection.c
+EXAMPLES += telepathy-1-example-inspect-connection
+telepathy_1_example_inspect_connection_SOURCES = inspect-connection.c
 
-EXAMPLES += telepathy-example-inspect-contact
-telepathy_example_inspect_contact_SOURCES = inspect-contact.c
+EXAMPLES += telepathy-1-example-inspect-contact
+telepathy_1_example_inspect_contact_SOURCES = inspect-contact.c
 
-EXAMPLES += telepathy-example-inspect-cm
-telepathy_example_inspect_cm_SOURCES = inspect-cm.c
+EXAMPLES += telepathy-1-example-inspect-cm
+telepathy_1_example_inspect_cm_SOURCES = inspect-cm.c
 
-EXAMPLES += telepathy-example-list-connections
-telepathy_example_list_connections_SOURCES = list-connections.c
+EXAMPLES += telepathy-1-example-list-connections
+telepathy_1_example_list_connections_SOURCES = list-connections.c
 
-EXAMPLES += telepathy-example-list-managers
-telepathy_example_list_managers_SOURCES = list-managers.c
+EXAMPLES += telepathy-1-example-list-managers
+telepathy_1_example_list_managers_SOURCES = list-managers.c
 
-EXAMPLES += telepathy-example-extended-client
-telepathy_example_extended_client_SOURCES = extended-client.c
-telepathy_example_extended_client_LDADD = \
+EXAMPLES += telepathy-1-example-extended-client
+telepathy_1_example_extended_client_SOURCES = extended-client.c
+telepathy_1_example_extended_client_LDADD = \
     $(top_builddir)/examples/extensions/libexample-extensions.la \
     $(LDADD)
 
-EXAMPLES += telepathy-example-media-observer
-telepathy_example_media_observer_SOURCES = media-observer.c
+EXAMPLES += telepathy-1-example-media-observer
+telepathy_1_example_media_observer_SOURCES = media-observer.c
 
-EXAMPLES += telepathy-example-approver
-telepathy_example_approver_SOURCES = approver.c
+EXAMPLES += telepathy-1-example-approver
+telepathy_1_example_approver_SOURCES = approver.c
 
-EXAMPLES += telepathy-example-text-handler
-telepathy_example_text_handler_SOURCES = text-handler.c
+EXAMPLES += telepathy-1-example-text-handler
+telepathy_1_example_text_handler_SOURCES = text-handler.c
 
-EXAMPLES += telepathy-example-contact-list
-telepathy_example_contact_list_SOURCES = contact-list.c
+EXAMPLES += telepathy-1-example-contact-list
+telepathy_1_example_contact_list_SOURCES = contact-list.c
 
 if INSTALL_EXAMPLES
 bin_PROGRAMS = $(EXAMPLES)
diff --git a/examples/client/python/Makefile.am b/examples/client/python/Makefile.am
index 939cb4972..38a3577f9 100644
--- a/examples/client/python/Makefile.am
+++ b/examples/client/python/Makefile.am
@@ -10,18 +10,18 @@ EXTRA_DIST = \
   stream-tube-accepter.py
 
 installable_scripts = \
-    telepathy-example-python-dialler \
-    telepathy-example-python-contact-list \
-    telepathy-example-python-ensure-channel \
-    telepathy-example-python-file-transfer \
-    telepathy-example-python-ft-handler \
-    telepathy-example-python-inspect-cm \
-    telepathy-example-python-text-handler \
-    telepathy-example-python-stream-tube-accepter \
-    telepathy-example-python-stream-tube-offerer \
+    telepathy-1-example-python-dialler \
+    telepathy-1-example-python-contact-list \
+    telepathy-1-example-python-ensure-channel \
+    telepathy-1-example-python-file-transfer \
+    telepathy-1-example-python-ft-handler \
+    telepathy-1-example-python-inspect-cm \
+    telepathy-1-example-python-text-handler \
+    telepathy-1-example-python-stream-tube-accepter \
+    telepathy-1-example-python-stream-tube-offerer \
     $(NULL)
 
-telepathy-example-python-%: %.py
+telepathy-1-example-python-%: %.py
 	cp $< $@
 	chmod +x $@
 
diff --git a/examples/cm/call/Makefile.am b/examples/cm/call/Makefile.am
index 8f90515d0..d6d614f83 100644
--- a/examples/cm/call/Makefile.am
+++ b/examples/cm/call/Makefile.am
@@ -1,6 +1,6 @@
 # Example connection manager with audio/video calls.
 
-EXAMPLES = telepathy-example-cm-call
+EXAMPLES = telepathy-1-example-cm-call
 noinst_LTLIBRARIES = libexample-cm-call.la
 
 if INSTALL_EXAMPLES
@@ -27,10 +27,10 @@ libexample_cm_call_la_SOURCES = \
 
 libexample_cm_call_la_LIBADD = $(LDADD)
 
-telepathy_example_cm_call_SOURCES = \
+telepathy_1_example_cm_call_SOURCES = \
     main.c
 
-telepathy_example_cm_call_LDADD = \
+telepathy_1_example_cm_call_LDADD = \
     $(noinst_LTLIBRARIES)
 
 servicedir = ${datadir}/dbus-1/services
@@ -41,9 +41,9 @@ $(service_DATA): %: Makefile
 	$(MKDIR_P) _gen
 	{ echo "[D-BUS Service]" && \
 	echo "Name=im.telepathy.v1.ConnectionManager.example_call" && \
-	echo "Exec=${libexecdir}/telepathy-example-cm-call"; } > $@
+	echo "Exec=${libexecdir}/telepathy-1-example-cm-call"; } > $@
 
-managerdir = ${datadir}/telepathy/managers
+managerdir = ${datadir}/telepathy-1/managers
 dist_manager_DATA = example_call.manager
 endif
 
diff --git a/examples/cm/channelspecific/Makefile.am b/examples/cm/channelspecific/Makefile.am
index be2d8bb6f..c45696454 100644
--- a/examples/cm/channelspecific/Makefile.am
+++ b/examples/cm/channelspecific/Makefile.am
@@ -1,7 +1,7 @@
 # Example connection manager with chatrooms where contacts have
 # channel-specific handles.
 
-EXAMPLES = telepathy-example-cm-csh
+EXAMPLES = telepathy-1-example-cm-csh
 noinst_LTLIBRARIES = libexample-cm-csh.la
 
 if INSTALL_EXAMPLES
@@ -24,10 +24,10 @@ libexample_cm_csh_la_SOURCES = \
 
 libexample_cm_csh_la_LIBADD = $(LDADD)
 
-telepathy_example_cm_csh_SOURCES = \
+telepathy_1_example_cm_csh_SOURCES = \
     main.c
 
-telepathy_example_cm_csh_LDADD = \
+telepathy_1_example_cm_csh_LDADD = \
     $(noinst_LTLIBRARIES)
 
 servicedir = ${datadir}/dbus-1/services
@@ -38,9 +38,9 @@ $(service_DATA): %: Makefile
 	$(MKDIR_P) _gen
 	{ echo "[D-BUS Service]" && \
 	echo "Name=im.telepathy.v1.ConnectionManager.example_csh" && \
-	echo "Exec=${libexecdir}/telepathy-example-cm-csh"; } > $@
+	echo "Exec=${libexecdir}/telepathy-1-example-cm-csh"; } > $@
 
-managerdir = ${datadir}/telepathy/managers
+managerdir = ${datadir}/telepathy-1/managers
 dist_manager_DATA = example_csh.manager
 endif
 
diff --git a/examples/cm/contactlist/Makefile.am b/examples/cm/contactlist/Makefile.am
index e9d076499..b25bef1b9 100644
--- a/examples/cm/contactlist/Makefile.am
+++ b/examples/cm/contactlist/Makefile.am
@@ -1,6 +1,6 @@
 # Example connection manager with ContactList channels.
 
-EXAMPLES = telepathy-example-cm-contactlist
+EXAMPLES = telepathy-1-example-cm-contactlist
 noinst_LTLIBRARIES = libexample-cm-contactlist.la
 
 if INSTALL_EXAMPLES
@@ -21,10 +21,10 @@ libexample_cm_contactlist_la_SOURCES = \
 
 libexample_cm_contactlist_la_LIBADD = $(LDADD)
 
-telepathy_example_cm_contactlist_SOURCES = \
+telepathy_1_example_cm_contactlist_SOURCES = \
     main.c
 
-telepathy_example_cm_contactlist_LDADD = \
+telepathy_1_example_cm_contactlist_LDADD = \
     $(noinst_LTLIBRARIES)
 
 if INSTALL_EXAMPLES
@@ -34,9 +34,9 @@ $(service_DATA): %: Makefile
 	$(MKDIR_P) _gen
 	{ echo "[D-BUS Service]" && \
 	echo "Name=im.telepathy.v1.ConnectionManager.example_contact_list" && \
-	echo "Exec=${libexecdir}/telepathy-example-cm-contactlist"; } > $@
+	echo "Exec=${libexecdir}/telepathy-1-example-cm-contactlist"; } > $@
 
-managerdir = ${datadir}/telepathy/managers
+managerdir = ${datadir}/telepathy-1/managers
 dist_manager_DATA = example_contact_list.manager
 endif
 
diff --git a/examples/cm/echo-message-parts/Makefile.am b/examples/cm/echo-message-parts/Makefile.am
index 2b870f44a..966c3c01e 100644
--- a/examples/cm/echo-message-parts/Makefile.am
+++ b/examples/cm/echo-message-parts/Makefile.am
@@ -1,4 +1,4 @@
-EXAMPLES = telepathy-example-cm-echo-2
+EXAMPLES = telepathy-1-example-cm-echo-2
 noinst_LTLIBRARIES = libexample-cm-echo-2.la
 
 if INSTALL_EXAMPLES
@@ -21,10 +21,10 @@ libexample_cm_echo_2_la_SOURCES = \
 
 libexample_cm_echo_2_la_LIBADD = $(LDADD)
 
-telepathy_example_cm_echo_2_SOURCES = \
+telepathy_1_example_cm_echo_2_SOURCES = \
     main.c
 
-telepathy_example_cm_echo_2_LDADD = \
+telepathy_1_example_cm_echo_2_LDADD = \
     $(noinst_LTLIBRARIES)
 
 if INSTALL_EXAMPLES
@@ -34,9 +34,9 @@ $(service_DATA): %: Makefile
 	$(MKDIR_P) _gen
 	{ echo "[D-BUS Service]" && \
 	echo "Name=im.telepathy.v1.ConnectionManager.example_echo_2" && \
-	echo "Exec=${libexecdir}/telepathy-example-cm-echo-2"; } > $@
+	echo "Exec=${libexecdir}/telepathy-1-example-cm-echo-2"; } > $@
 
-managerdir = ${datadir}/telepathy/managers
+managerdir = ${datadir}/telepathy-1/managers
 dist_manager_DATA = example_echo_2.manager
 endif
 
diff --git a/examples/cm/extended/Makefile.am b/examples/cm/extended/Makefile.am
index 629df7a98..ba02bc2e0 100644
--- a/examples/cm/extended/Makefile.am
+++ b/examples/cm/extended/Makefile.am
@@ -1,4 +1,4 @@
-EXAMPLES = telepathy-example-cm-extended
+EXAMPLES = telepathy-1-example-cm-extended
 
 if INSTALL_EXAMPLES
 libexec_PROGRAMS = $(EXAMPLES)
@@ -6,7 +6,7 @@ else
 noinst_PROGRAMS = $(EXAMPLES)
 endif
 
-telepathy_example_cm_extended_SOURCES = \
+telepathy_1_example_cm_extended_SOURCES = \
     conn.c \
     conn.h \
     connection-manager.c \
@@ -22,9 +22,9 @@ $(service_DATA): %: Makefile
 	$(MKDIR_P) _gen
 	{ echo "[D-BUS Service]" && \
 	echo "Name=im.telepathy.v1.ConnectionManager.example_extended" && \
-	echo "Exec=${libexecdir}/telepathy-example-cm-extended"; } > $@
+	echo "Exec=${libexecdir}/telepathy-1-example-cm-extended"; } > $@
 
-managerdir = ${datadir}/telepathy/managers
+managerdir = ${datadir}/telepathy-1/managers
 dist_manager_DATA = example_extended.manager
 endif
 
diff --git a/examples/cm/no-protocols/Makefile.am b/examples/cm/no-protocols/Makefile.am
index a746a5135..a5a9fd84f 100644
--- a/examples/cm/no-protocols/Makefile.am
+++ b/examples/cm/no-protocols/Makefile.am
@@ -1,4 +1,4 @@
-EXAMPLES = telepathy-example-no-protocols
+EXAMPLES = telepathy-1-example-no-protocols
 
 if INSTALL_EXAMPLES
 libexec_PROGRAMS = $(EXAMPLES)
@@ -6,7 +6,7 @@ else
 noinst_PROGRAMS = $(EXAMPLES)
 endif
 
-telepathy_example_no_protocols_SOURCES = \
+telepathy_1_example_no_protocols_SOURCES = \
     connection-manager.c \
     connection-manager.h \
     main.c
@@ -18,9 +18,9 @@ $(service_DATA): %: Makefile
 	$(MKDIR_P) _gen
 	{ echo "[D-BUS Service]" && \
 	echo "Name=im.telepathy.v1.ConnectionManager.example_no_protocols" && \
-	echo "Exec=${libexecdir}/telepathy-example-cm-no-protocols"; } > $@
+	echo "Exec=${libexecdir}/telepathy-1-example-cm-no-protocols"; } > $@
 
-managerdir = ${datadir}/telepathy/managers
+managerdir = ${datadir}/telepathy-1/managers
 dist_manager_DATA = example_no_protocols.manager
 endif
 
diff --git a/tests/dbus/example-no-protocols.c b/tests/dbus/example-no-protocols.c
index 04ca46761..21a155fda 100644
--- a/tests/dbus/example-no-protocols.c
+++ b/tests/dbus/example-no-protocols.c
@@ -37,13 +37,13 @@ prepare (void)
     {
       command[0] = g_strdup_printf ("%s/%s",
             abs_top_builddir,
-            "examples/cm/no-protocols/telepathy-example-no-protocols");
+            "examples/cm/no-protocols/telepathy-1-example-no-protocols");
     }
   else
     {
       command[0] = g_strdup_printf ("%s/%s",
           libexec,
-          "telepathy-example-no-protocols");
+          "telepathy-1-example-no-protocols");
     }
 
   if (!g_spawn_async (NULL, command, NULL, 0, NULL, NULL, NULL, &error))