[next] telepathy-mission-control: rename mc-tool and mc-wait-for-name
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Thu Oct 31 17:07:22 CET 2013
Module: telepathy-mission-control
Branch: next
Commit: de42e514debd349af058e1957f06d5cd5a36f7a5
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=de42e514debd349af058e1957f06d5cd5a36f7a5
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Thu Oct 31 11:15:31 2013 +0100
rename mc-tool and mc-wait-for-name
---
.gitignore | 6 +-
util/Makefile.am | 12 ++--
util/{mc-tool.1 => mc6-tool.1} | 62 ++++++++++----------
...c-wait-for-name.1.in => mc6-wait-for-name.1.in} | 10 ++--
4 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/.gitignore b/.gitignore
index c211756..87d39e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,7 +101,7 @@ tests/twisted/tools/servicedir-uninstalled/tmp-session-bus.conf
/tests/twisted/with-session-bus-*.address
/tests/twisted/with-session-bus-*.pid
/util/mc-account-convert
-/util/mc-tool
-/util/mc-wait-for-name
-/util/mc-wait-for-name.1
+/util/mc6-tool
+/util/mc6-wait-for-name
+/util/mc6-wait-for-name.1
tests/twisted/config.py
diff --git a/util/Makefile.am b/util/Makefile.am
index 4a5a601..93b9bce 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -15,21 +15,21 @@ LDADD = \
AM_CFLAGS = $(ERROR_CFLAGS)
-bin_PROGRAMS = mc-tool mc-wait-for-name
+bin_PROGRAMS = mc6-tool mc6-wait-for-name
-mc_tool_SOURCES = mc-tool.c
+mc6_tool_SOURCES = mc-tool.c
-mc_wait_for_name_SOURCES = wait-for-name.c
+mc6_wait_for_name_SOURCES = wait-for-name.c
-dist_man1_MANS = mc-tool.1
+dist_man1_MANS = mc6-tool.1
-man1_MANS = mc-wait-for-name.1
+man1_MANS = mc6-wait-for-name.1
EXTRA_DIST = \
$(man1_MANS:%=%.in)
CLEANFILES = $(man1_MANS)
-mc-wait-for-name.1: mc-wait-for-name.1.in Makefile
+mc6-wait-for-name.1: mc6-wait-for-name.1.in Makefile
$(AM_V_GEN)sed -e 's![@]bindir[@]!@bindir@!g' < $< > $@
Android.mk: Makefile.am
diff --git a/util/mc-tool.1 b/util/mc6-tool.1
similarity index 83%
rename from util/mc-tool.1
rename to util/mc6-tool.1
index 1653d20..399843c 100644
--- a/util/mc-tool.1
+++ b/util/mc6-tool.1
@@ -3,71 +3,71 @@
\" This document may be distributed under the same terms as
\" telepathy-mission-control itself.
.SH NAME
-mc-tool \- manipulate Mission Control accounts from the command line
+mc6-tool \- manipulate Mission Control accounts from the command line
.SH SYNOPSIS
-.B mc-tool list
+.B mc6-tool list
.PP
-.B mc-tool add
+.B mc6-tool add
.I PROFILE
.I DISPLAY-NAME
.IR "" [ PARAMETER-SETTINGS ...]
.PP
-.B mc-tool add
+.B mc6-tool add
.IR MANAGER / PROTOCOL " [" PARAMETER-SETTINGS ...]
.PP
-.B mc-tool update
+.B mc6-tool update
.IR ACCOUNT " [" PARAMETER-SETTINGS ...]
.PP
-.B mc-tool display
+.B mc6-tool display
.I ACCOUNT DISPLAY-NAME
.PP
-.B mc-tool nick
+.B mc6-tool nick
.I ACCOUNT NICKNAME
.PP
-.B mc-tool service
+.B mc6-tool service
.I ACCOUNT SERVICE-NAME
.PP
-.B mc-tool icon
+.B mc6-tool icon
.I ACCOUNT ICON
.PP
-.B mc-tool show
+.B mc6-tool show
.I ACCOUNT
.PP
-.B mc-tool get
+.B mc6-tool get
.I ACCOUNT
.IR PARAMETER " [" PARAMETER ...]
.PP
-.B mc-tool auto-presence
+.B mc6-tool auto-presence
.IR ACCOUNT " " STATUS " [" MESSAGE ]
.PP
-.B mc-tool request
+.B mc6-tool request
.IR ACCOUNT " " STATUS " [" MESSAGE ]
.PP
-.B mc-tool auto-connect
+.B mc6-tool auto-connect
.I ACCOUNT
.BR on | off
.PP
-.B mc-tool remove
+.B mc6-tool remove
.I ACCOUNT
.PP
.SH DESCRIPTION
-.BR mc-tool 's
+.BR mc6-tool 's
usage depends on its first argument (the "command")
.SS SPECIFYING ACCOUNTS
@@ -90,7 +90,7 @@ is either
.BR int ", " uint ", " bool ", or "
.BR string
(other parameter types exist, but are currently unsupported by
-.BR mc-tool ),
+.BR mc6-tool ),
.I NAME
is the name of the connection manager parameter (e.g.
.BR account " or " password ),
@@ -105,11 +105,11 @@ command also accepts arguments of the form
.BI clear: NAME
which delete the named parameter from the account configuration.
.SS LIST
-.B mc-tool list
+.B mc6-tool list
lists the available accounts.
.SS ADD
-.B mc-tool add
+.B mc6-tool add
adds an account. The connection manager and protocol can either be given
as the name of a Mission Control
.IR profile ,
@@ -119,7 +119,7 @@ or as a slash-separated connection manager name and protocol (e.g.
.BR gabble/jabber ).
.SS DISPLAY
-.B mc-tool display
+.B mc6-tool display
.I ACCOUNT DISPLAY-NAME
sets the
.B DisplayName
@@ -127,7 +127,7 @@ property of
.IR ACCOUNT " to " DISPLAY-NAME.
.SS NICK
-.B mc-tool nick
+.B mc6-tool nick
.I ACCOUNT NICKNAME
sets the
.B Nickname
@@ -135,7 +135,7 @@ property of
.IR ACCOUNT " to " NICKNAME .
.SS SERVICE
-.B mc-tool service
+.B mc6-tool service
.I ACCOUNT SERVICE-NAME
sets the
.B Service
@@ -143,7 +143,7 @@ property of
.IR ACCOUNT " to " SERVICE-NAME .
.SS ICON
-.B mc-tool icon
+.B mc6-tool icon
.I ACCOUNT ICON
sets the
.B Icon
@@ -151,20 +151,20 @@ property of
.IR ACCOUNT " to " ICON .
.SS SHOW
-.B mc-tool show
+.B mc6-tool show
.I ACCOUNT
shows information about
.IR ACCOUNT .
.SS GET
-.B mc-tool get
+.B mc6-tool get
.I ACCOUNT
.IR PARAMETER " [" PARAMETER ...]
shows the values of the given parameters of
.IR ACCOUNT .
.SS ENABLE
-.B mc-tool enable
+.B mc6-tool enable
.I ACCOUNT
sets the
.B Enabled
@@ -173,7 +173,7 @@ property of
.BR True .
.SS DISABLE
-.B mc-tool disable
+.B mc6-tool disable
.I ACCOUNT
sets the
.B Enabled
@@ -182,7 +182,7 @@ property of
.BR False .
.SS AUTO-PRESENCE
-.B mc-tool auto-presence
+.B mc6-tool auto-presence
.IR ACCOUNT " " STATUS " [" MESSAGE ]
sets the
.B AutomaticPresence
@@ -191,7 +191,7 @@ property of
.IR STATUS " with optional message " MESSAGE .
.SS REQUEST
-.B mc-tool request
+.B mc6-tool request
.IR ACCOUNT " " STATUS " [" MESSAGE ]
sets the
.B RequestedPresence
@@ -201,7 +201,7 @@ property of
this is how you tell an account to connect or go offline, for example.
.SS AUTO-CONNECT
-.B mc-tool auto-connect
+.B mc6-tool auto-connect
.I ACCOUNT
.B on
sets the
@@ -209,7 +209,7 @@ sets the
property of
.IR ACCOUNT " to"
.BR True .
-.B mc-tool auto-connect
+.B mc6-tool auto-connect
.I ACCOUNT
.B off
sets it to
diff --git a/util/mc-wait-for-name.1.in b/util/mc6-wait-for-name.1.in
similarity index 80%
rename from util/mc-wait-for-name.1.in
rename to util/mc6-wait-for-name.1.in
index c233631..5e0a253 100644
--- a/util/mc-wait-for-name.1.in
+++ b/util/mc6-wait-for-name.1.in
@@ -3,18 +3,18 @@
\" This document may be distributed under the same terms as
\" telepathy-mission-control itself.
.SH NAME
-mc-wait-for-name \- run until a D-Bus name appears on the session bus
+mc6-wait-for-name \- run until a D-Bus name appears on the session bus
.SH SYNOPSIS
-.B mc-wait-for-name
+.B mc6-wait-for-name
.I WELL-KNOWN-NAME
.PP
.nf
.B [D-BUS Service]
.BI Name= im.telepathy1.Client.Something
-.BI Exec=@bindir@/mc-wait-for-name " im.telepathy1.Client.Something"
+.BI Exec=@bindir@/mc6-wait-for-name " im.telepathy1.Client.Something"
.fi
.SH DESCRIPTION
-.B mc-wait-for-name
+.B mc6-wait-for-name
runs until a bus name appears, then exits successfully. This can be used as a
service-activation helper for a bus name that is not directly activatable, but
will be provided automatically (after a while) by the desktop session.
@@ -28,7 +28,7 @@ Invocation error (too many or too few arguments, or the bus name given was
not a syntactically valid well-known bus name).
.TP
69 (EX_UNAVAILABLE)
-mc-wait-for-name was unable to connect to the session bus.
+mc6-wait-for-name was unable to connect to the session bus.
.TP
75 (EX_TEMPFAIL)
The name did not appear within a reasonable time.
More information about the telepathy-commits
mailing list