build: rename the binary from modem-manager' to ModemManager'

This commit is contained in:
Aleksander Morgado
2012-02-27 23:11:17 +01:00
parent 12786d21cf
commit 7d9d003324
9 changed files with 25 additions and 28 deletions

6
.gitignore vendored
View File

@@ -31,7 +31,7 @@ ModemManager.pc
callouts/mm-modem-probe callouts/mm-modem-probe
test/lsudev test/lsudev
src/modem-manager src/ModemManager
src/mm-daemon-enums-types.c src/mm-daemon-enums-types.c
src/mm-daemon-enums-types.h src/mm-daemon-enums-types.h
src/mm-serial-enums-types.c src/mm-serial-enums-types.c
@@ -43,8 +43,6 @@ src/tests/test-qcdm-serial-port
src/tests/test-at-serial-port src/tests/test-at-serial-port
src/tests/test-sms-part src/tests/test-sms-part
policy/org.freedesktop.modem-manager.policy
cli/mmcli cli/mmcli
libqcdm/tests/test-qcdm libqcdm/tests/test-qcdm
@@ -88,7 +86,7 @@ docs/reference/api/html
docs/reference/api/tmpl docs/reference/api/tmpl
docs/reference/api/xml docs/reference/api/xml
docs/man/modem-manager.8 docs/man/ModemManager.8
m4/gtk-doc.m4 m4/gtk-doc.m4
m4/intltool.m4 m4/intltool.m4

View File

@@ -199,7 +199,7 @@ introspection/Makefile
po/Makefile.in po/Makefile.in
docs/Makefile docs/Makefile
docs/man/Makefile docs/man/Makefile
docs/man/modem-manager.8 docs/man/ModemManager.8
docs/reference/Makefile docs/reference/Makefile
docs/reference/api/Makefile docs/reference/api/Makefile
docs/reference/api/version.xml docs/reference/api/version.xml

View File

@@ -29,7 +29,7 @@ dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
# Icon # Icon
icondir=${datadir}/icons/hicolor/22x22/apps icondir=${datadir}/icons/hicolor/22x22/apps
icon_DATA = modem-manager.png icon_DATA = ModemManager.png
# Polkit # Polkit

View File

Before

Width:  |  Height:  |  Size: 817 B

After

Width:  |  Height:  |  Size: 817 B

View File

@@ -7,7 +7,7 @@
<vendor>ModemManager</vendor> <vendor>ModemManager</vendor>
<vendor_url>http://www.freedesktop.org/wiki/ModemManager</vendor_url> <vendor_url>http://www.freedesktop.org/wiki/ModemManager</vendor_url>
<icon_name>modem-manager</icon_name> <icon_name>ModemManager</icon_name>
<action id="org.freedesktop.ModemManager1.Control"> <action id="org.freedesktop.ModemManager1.Control">
<_description>Control the Modem Manager daemon</_description> <_description>Control the Modem Manager daemon</_description>

View File

@@ -1,4 +1,4 @@
[D-BUS Service] [D-BUS Service]
Name=org.freedesktop.ModemManager1 Name=org.freedesktop.ModemManager1
Exec=@sbindir@/modem-manager Exec=@sbindir@/ModemManager
User=root User=root

View File

@@ -1,7 +1,7 @@
man_MANS = modem-manager.8 man_MANS = ModemManager.8
EXTRA_DIST = \ EXTRA_DIST = \
$(man_MANS) \ $(man_MANS) \
modem-manager.8.in ModemManager.8.in
CLEANFILES = $(man_MANS) CLEANFILES = $(man_MANS)

View File

@@ -1,16 +1,16 @@
.\" modem-manager(8) manual page .\" ModemManager(8) manual page
.\" .\"
.\" Copyright (C) 2011 Aleksander Morgado .\" Copyright (C) 2011 Aleksander Morgado
.\" .\"
.TH MODEMMANAGER "8" "31 October 2011" .TH MODEMMANAGER "8" "31 October 2011"
.SH NAME .SH NAME
modem-manager \- modem management daemon ModemManager \- modem management daemon
.SH SYNOPSIS .SH SYNOPSIS
.B modem-manager [\-\-version] | [\-\-help] .B ModemManager [\-\-version] | [\-\-help]
.PP .PP
.B modem-manager [\-\-debug] [\-\-log\-level=<level>] [\-\-log\-file=<filename>] [\-\-timestamps] [\-\-relative\-timestamps] .B ModemManager [\-\-debug] [\-\-log\-level=<level>] [\-\-log\-file=<filename>] [\-\-timestamps] [\-\-relative\-timestamps]
.SH DESCRIPTION .SH DESCRIPTION
The modem-manager (a.k.a. ModemManager) daemon provides a unified high level API The ModemManager daemon provides a unified high level API
for communicating with (mobile broadband) modems. While the basic commands are for communicating with (mobile broadband) modems. While the basic commands are
standardized, the more advanced operations (like signal quality monitoring standardized, the more advanced operations (like signal quality monitoring
while connected) varies a lot. while connected) varies a lot.
@@ -21,23 +21,23 @@ command line.
The following options are supported: The following options are supported:
.TP .TP
.I "\-\-version" .I "\-\-version"
Print the modem-manager software version and exit. Print the ModemManager software version and exit.
.TP .TP
.I "\-\-help" .I "\-\-help"
Print modem-manager's available options and exit. Print ModemManager's available options and exit.
.TP .TP
.I "\-\-debug" .I "\-\-debug"
Runs modem-manager with "DEBUG" log level and without daemonizing. This is useful Runs ModemManager with "DEBUG" log level and without daemonizing. This is useful
for debugging, as it directs log output to the controlling terminal in addition to for debugging, as it directs log output to the controlling terminal in addition to
syslog. syslog.
.TP .TP
.I "\-\-log\-level=<level>" .I "\-\-log\-level=<level>"
Sets how much information modem-manager sends to the log destination (usually Sets how much information ModemManager sends to the log destination (usually
syslog's "daemon" facility). By default, only informational, warning, and error syslog's "daemon" facility). By default, only informational, warning, and error
messages are logged. Given level must be one of "ERR", "WARN", "INFO" or "DEBUG". messages are logged. Given level must be one of "ERR", "WARN", "INFO" or "DEBUG".
.TP .TP
.I "\-\-log\-file=<filename>" .I "\-\-log\-file=<filename>"
Specify location of the file where modem-manager will dump its log messages, Specify location of the file where ModemManager will dump its log messages,
instead of syslog. instead of syslog.
.TP .TP
.I "\-\-timestamps" .I "\-\-timestamps"
@@ -49,4 +49,3 @@ Include timestamps, relative to the start time of the daemon, in the log output.
.SH SEE ALSO .SH SEE ALSO
.BR NetworkManager (8). .BR NetworkManager (8).

View File

@@ -95,9 +95,9 @@ mm-marshal.c: mm-marshal.list mm-marshal.h
$(AM_V_GEN) echo "#include \"mm-marshal.h\"" > $@ && \ $(AM_V_GEN) echo "#include \"mm-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --prefix=mm_marshal --body >> $@ $(GLIB_GENMARSHAL) $< --prefix=mm_marshal --body >> $@
sbin_PROGRAMS = modem-manager sbin_PROGRAMS = ModemManager
modem_manager_CPPFLAGS = \ ModemManager_CPPFLAGS = \
$(MM_CFLAGS) \ $(MM_CFLAGS) \
$(GUDEV_CFLAGS) \ $(GUDEV_CFLAGS) \
-I$(top_srcdir) \ -I$(top_srcdir) \
@@ -108,10 +108,10 @@ modem_manager_CPPFLAGS = \
-DPLUGINDIR=\"$(pkglibdir)\" -DPLUGINDIR=\"$(pkglibdir)\"
if WITH_POLKIT if WITH_POLKIT
modem_manager_CPPFLAGS += $(POLKIT_CFLAGS) ModemManager_CPPFLAGS += $(POLKIT_CFLAGS)
endif endif
modem_manager_LDADD = \ ModemManager_LDADD = \
$(MM_LIBS) \ $(MM_LIBS) \
$(GUDEV_LIBS) \ $(GUDEV_LIBS) \
$(builddir)/libmodem-helpers.la \ $(builddir)/libmodem-helpers.la \
@@ -119,10 +119,10 @@ modem_manager_LDADD = \
$(top_builddir)/libqcdm/src/libqcdm.la $(top_builddir)/libqcdm/src/libqcdm.la
if WITH_POLKIT if WITH_POLKIT
modem_manager_LDADD += $(POLKIT_LIBS) ModemManager_LDADD += $(POLKIT_LIBS)
endif endif
modem_manager_SOURCES = \ ModemManager_SOURCES = \
main.c \ main.c \
mm-marshal.h \ mm-marshal.h \
mm-marshal.c \ mm-marshal.c \
@@ -188,7 +188,7 @@ modem_manager_SOURCES = \
mm-plugin-base.h mm-plugin-base.h
if WITH_POLKIT if WITH_POLKIT
modem_manager_SOURCES += \ ModemManager_SOURCES += \
mm-auth-provider-polkit.c \ mm-auth-provider-polkit.c \
mm-auth-provider-polkit.h mm-auth-provider-polkit.h
endif endif