2005-01-18 Havoc Pennington <hp@redhat.com>

	* rename dbus-daemon-1 to dbus-daemon throughout

5 files changed, 25 insertions, 25 deletions

diff --git a/bus/Makefile.am b/bus/Makefile.am
index f6e03d77..b6480856 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -2,7 +2,7 @@
 configdir=$(sysconfdir)/dbus-1
 
 INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS)				\
-	-DDAEMON_NAME=\"dbus-daemon-1\"  -DDBUS_COMPILATION		\
+	-DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION		\
 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
 	-DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\"
 
@@ -16,7 +16,7 @@ config_DATA=					\
 	session.conf				\
 	system.conf
 
-bin_PROGRAMS=dbus-daemon-1
+bin_PROGRAMS=dbus-daemon
 
 if DBUS_USE_LIBXML
 XML_SOURCES=config-loader-libxml.c
@@ -56,11 +56,11 @@ BUS_SOURCES=					\
 	utils.h					\
 	$(XML_SOURCES)
 
-dbus_daemon_1_SOURCES=				\
+dbus_daemon_SOURCES=				\
 	$(BUS_SOURCES)				\
 	main.c					
 
-dbus_daemon_1_LDADD=					\
+dbus_daemon_LDADD=					\
 	$(EFENCE)					\
 	$(DBUS_BUS_LIBS)				\
 	$(top_builddir)/dbus/libdbus-convenience.la
@@ -108,7 +108,7 @@ initd_SCRIPTS= 	\
 
 endif
  ## Red Hat end
- 
+
 ## Slackware start
 if DBUS_INIT_SCRIPTS_SLACKWARE
 
@@ -120,8 +120,8 @@ initd_SCRIPTS= 	\
 endif
 ## Slackware end
 
-MAN_IN_FILES=dbus-daemon-1.1.in
-man_MANS = dbus-daemon-1.1
+MAN_IN_FILES=dbus-daemon.1.in
+man_MANS = dbus-daemon.1
 
 #### Extra dist 
 
diff --git a/bus/dbus-daemon-1.1.in b/bus/dbus-daemon.1.in
index c38ca68a..902ff374 100644
--- a/bus/dbus-daemon-1.1.in
+++ b/bus/dbus-daemon.1.in
@@ -1,22 +1,22 @@
 .\" 
-.\" dbus-daemon-1 manual page.
+.\" dbus-daemon manual page.
 .\" Copyright (C) 2003 Red Hat, Inc.
 .\"
-.TH dbus-daemon-1 1
+.TH dbus-daemon 1
 .SH NAME
-dbus-daemon-1 \- Message bus daemon
+dbus-daemon \- Message bus daemon
 .SH SYNOPSIS
 .PP
-.B dbus-daemon-1
-dbus-daemon-1 [\-\-version] [\-\-session] [\-\-system] [\-\-config-file=FILE]
+.B dbus-daemon
+dbus-daemon [\-\-version] [\-\-session] [\-\-system] [\-\-config-file=FILE]
 [\-\-print-address[=DESCRIPTOR]] [\-\-print-pid[=DESCRIPTOR]] [\-\-fork]
 
 .SH DESCRIPTION
 
-\fIdbus-daemon-1\fP is the D-BUS message bus daemon. See
+\fIdbus-daemon\fP is the D-BUS message bus daemon. See
 http://www.freedesktop.org/software/dbus/ for more information about
 the big picture. D-BUS is first a library that provides one-to-one
-communication between any two applications; \fIdbus-daemon-1\fP is an
+communication between any two applications; \fIdbus-daemon\fP is an
 application that uses this library to implement a message bus
 daemon. Multiple programs connect to the message bus daemon and can
 exchange messages with one another.
@@ -25,7 +25,7 @@ exchange messages with one another.
 There are two standard message bus instances: the systemwide message bus 
 (installed on many systems as the "messagebus" init service) and the 
 per-user-login-session message bus (started each time a user logs in).
-\fIdbus-daemon-1\fP is used for both of these instances, but with 
+\fIdbus-daemon\fP is used for both of these instances, but with 
 a different configuration file.
 
 .PP
diff --git a/bus/main.c b/bus/main.c
index 40ec9a07..f4b188a9 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -62,7 +62,7 @@ signal_handler (int sig)
 static void
 usage (void)
 {
-  fprintf (stderr, "dbus-daemon-1 [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork]\n");
+  fprintf (stderr, DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork]\n");
   exit (1);
 }
 
diff --git a/bus/messagebus.in b/bus/messagebus.in
index 7a358764..55fef0fb 100755
--- a/bus/messagebus.in
+++ b/bus/messagebus.in
@@ -6,18 +6,18 @@
 # description:  This is a daemon which broadcasts notifications of system events \
 #               and other messages. See http://www.freedesktop.org/software/dbus/
 #
-# processname: dbus-daemon-1
+# processname: dbus-daemon
 # pidfile: @DBUS_SYSTEM_PID_FILE@
 #
 
 # Sanity checks.
-[ -x @EXPANDED_BINDIR@/dbus-daemon-1 ] || exit 0
+[ -x @EXPANDED_BINDIR@/dbus-daemon ] || exit 0
 
 # Source function library.
 . @EXPANDED_SYSCONFDIR@/rc.d/init.d/functions
 
 # so we can rearrange this easily
-processname=dbus-daemon-1
+processname=dbus-daemon
 servicename=messagebus
 
 RETVAL=0
diff --git a/bus/rc.messagebus.in b/bus/rc.messagebus.in
index 4214a9f4..46a3076d 100644
--- a/bus/rc.messagebus.in
+++ b/bus/rc.messagebus.in
@@ -6,26 +6,26 @@
 # description:  This is a daemon which broadcasts notifications of system events \
 #               and other messages. See http://www.freedesktop.org/software/dbus/
 #
-# processname: dbus-daemon-1
+# processname: dbus-daemon
 # pidfile: @DBUS_SYSTEM_PID_FILE@
 #
 
 # Sanity checks.
-#[ -x @EXPANDED_BINDIR@/dbus-daemon-1 ] || exit 0
+#[ -x @EXPANDED_BINDIR@/dbus-daemon ] || exit 0
 
 # Source function library.
 #. @EXPANDED_SYSCONFDIR@/rc.d/init.d/functions
 
 # so we can rearrange this easily
-#processname=dbus-daemon-1
+#processname=dbus-daemon
 #servicename=messagebus
 
 #RETVAL=0
 
 start() {
     echo "Starting system message bus"
-    if [ -x @EXPANDED_BINDIR@/dbus-daemon-1 ];then
-    	@EXPANDED_BINDIR@/dbus-daemon-1 --system
+    if [ -x @EXPANDED_BINDIR@/dbus-daemon ];then
+    	@EXPANDED_BINDIR@/dbus-daemon --system
     fi
     #daemon --check $servicename $processname --system
     #RETVAL=$?
@@ -39,7 +39,7 @@ stop() {
     ## we don't want to kill all the per-user $processname, we want
     ## to use the pid file *only*; because we use the fake nonexistent 
     ## program name "$servicename" that should be safe-ish
-    killall dbus-daemon-1
+    killall dbus-daemon
     #RETVAL=$?
     #echo
     #if [ $RETVAL -eq 0 ]; then