modem-probe: rename from probe-modem for consistency

9 files changed, 24 insertions, 24 deletions

diff --git a/Makefile.am b/Makefile.am
index ad89bb0..3de6226 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.am.inc
 
 SUBDIRS = \
-	probe-modem \
+	modem-probe \
 	modem-modeswitch \
 	udev-acl
 
diff --git a/autogen.sh b/autogen.sh
index e6bf5bc..4287fdb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ REQUIRED_AUTOMAKE_VERSION=1.9
 PKG_NAME=udev-extras
 
 (test -f $srcdir/configure.ac \
-  && test -f $srcdir/probe-modem/probe-modem.c) || {
+  && test -f $srcdir/modem-probe/modem-probe.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/configure.ac b/configure.ac
index cd0e2b7..4e0f22f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ AC_SUBST(udev_prefix)
 
 AC_CONFIG_FILES([
 Makefile
-probe-modem/Makefile
+modem-probe/Makefile
 modem-modeswitch/Makefile
 udev-acl/Makefile
 ])
diff --git a/probe-modem/.gitignore b/modem-probe/.gitignore
index 02e771b..02e771b 100644
--- a/probe-modem/.gitignore
+++ b/modem-probe/.gitignore
diff --git a/modem-probe/77-probe-modem-capabilities.rules b/modem-probe/77-probe-modem-capabilities.rules
new file mode 100644
index 0000000..7efb56f
--- /dev/null
+++ b/modem-probe/77-probe-modem-capabilities.rules
@@ -0,0 +1,10 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add|change", GOTO="modem_probe_end"
+SUBSYSTEM!="tty", GOTO="modem_probe_end"
+KERNEL!="tty*", GOTO="modem_probe_end"
+
+DRIVERS=="option|sierra|cdc_acm|hso", IMPORT{program}="modem-probe --export $tempnode"
+
+LABEL="modem_probe_end"
+
diff --git a/probe-modem/Makefile.am b/modem-probe/Makefile.am
index bf90fb3..c1df87f 100644
--- a/probe-modem/Makefile.am
+++ b/modem-probe/Makefile.am
@@ -1,13 +1,13 @@
 include $(top_srcdir)/Makefile.am.inc
 
 udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = probe-modem
+udevhome_PROGRAMS = modem-probe
 
-probe_modem_SOURCES = probe-modem.c
-probe_modem_CPPFLAGS = $(GLIB_CFLAGS)
-probe_modem_LDADD = $(GLIB_LIBS)
+modem_probe_SOURCES = modem-probe.c
+modem_probe_CPPFLAGS = $(GLIB_CFLAGS)
+modem_probe_LDADD = $(GLIB_LIBS)
 
 udevrulesdir = $(udev_prefix)/lib/udev/rules.d
 dist_udevrules_DATA = 77-probe-modem-capabilities.rules
-dist_man_MANS = probe-modem.8
+dist_man_MANS = modem-probe.8
 
diff --git a/probe-modem/probe-modem.8 b/modem-probe/modem-probe.8
index aaf3874..83956b7 100644
--- a/probe-modem/probe-modem.8
+++ b/modem-probe/modem-probe.8
@@ -1,19 +1,19 @@
-.TH PROBE_MODEM 8 "November 2005" "" "Linux Administrator's Manual"
+.TH MODEM_PROBE 8 "November 2005" "" "Linux Administrator's Manual"
 .SH NAME
-probe-modem \- udev callout to identify Hayes-compatible modem capabilities
+modem-probe \- udev callout to identify Hayes-compatible modem capabilities
 .SH SYNOPSIS
-.BI probe-modem
+.BI modem-probe
 [\fI--export\fP] [\fI--verbose\fP] [\fI--quiet\fP] [\fI--log <file>\fP] \fI<devpath>\fP
 .SH "DESCRIPTION"
-.B probe-modem
+.B modem-probe
 is normally called from a udev rule, to provide udev with the modem
 capabilities for Hayes-compatible modems.
 .SH USAGE
-.B probe-modem
+.B modem-probe
 opens the tty node specified at the commandline and prints the
 discovered modem capabilities.
 .SH OPTIONS
-The following commandline switches alter probe-modem's behavior:
+The following commandline switches alter modem-probe's behavior:
 .TP
 .BI \-\-export
 print values as environment keys
diff --git a/probe-modem/probe-modem.c b/modem-probe/modem-probe.c
index 99497db..99497db 100644
--- a/probe-modem/probe-modem.c
+++ b/modem-probe/modem-probe.c
diff --git a/probe-modem/77-probe-modem-capabilities.rules b/probe-modem/77-probe-modem-capabilities.rules
deleted file mode 100644
index e74f3ec..0000000
--- a/probe-modem/77-probe-modem-capabilities.rules
+++ /dev/null
@@ -1,10 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION!="add|change", GOTO="probe_modem_end"
-SUBSYSTEM!="tty", GOTO="probe_modem_end"
-KERNEL!="tty*", GOTO="probe_modem_end"
-
-DRIVERS=="option|sierra|cdc_acm|hso", IMPORT{program}="probe-modem --export $tempnode"
-
-LABEL="probe_modem_end"
-