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

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

11 files changed, 37 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index d64f8c26..1a9bcfcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-01-18  Havoc Pennington  <hp@redhat.com>
 
+	* rename dbus-daemon-1 to dbus-daemon throughout
+
+2005-01-18  Havoc Pennington  <hp@redhat.com>
+
         * Throughout, grand renaming to strip out the use of "service",
 	just say "name" instead (or "bus name" when ambiguous).  Did not
 	change the internal code of the message bus itself, only the
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
diff --git a/configure.in b/configure.in
index ffac0272..95ab6d1e 100644
--- a/configure.in
+++ b/configure.in
@@ -1141,7 +1141,7 @@ bus/system.conf
 bus/session.conf
 bus/messagebus
 bus/rc.messagebus
-bus/dbus-daemon-1.1
+bus/dbus-daemon.1
 Makefile
 dbus/Makefile
 glib/Makefile
diff --git a/doc/TODO b/doc/TODO
index eac3e50b..f7a064a0 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -74,14 +74,8 @@ Important for 1.0 GLib Bindings
 Might as Well for 1.0
 ===
 
- - Probably no point in a version number in the daemon name
-   (s/dbus-daemon-1/dbus-daemon/)
-
  - add dbus_message_has_path(), maybe has_member/interface
 
- - dbus_message_iter_init_array_iterator has "iter" and "iterator" 
-   in the same function name
-
  - connection_open/connection_disconnect lacks symmetry, open/close
    or connect/disconnect
 
diff --git a/test/glib/run-test.sh b/test/glib/run-test.sh
index 473946a9..eddea5f8 100755
--- a/test/glib/run-test.sh
+++ b/test/glib/run-test.sh
@@ -43,7 +43,7 @@ export MALLOC_CHECK_=2
 unset DBUS_SESSION_BUS_ADDRESS
 unset DBUS_SESSION_BUS_PID
 
-echo "Using daemon "`type dbus-daemon-1`
+echo "Using daemon "`type dbus-daemon`
 
 eval `$DBUS_TOP_BUILDDIR/tools/dbus-launch --sh-syntax --config-file=$CONFIG_FILE`
 
diff --git a/tools/dbus-launch.1 b/tools/dbus-launch.1
index 771dcb2c..33f0d239 100644
--- a/tools/dbus-launch.1
+++ b/tools/dbus-launch.1
@@ -11,7 +11,7 @@ dbus-launch \- Utility to start a message bus from a shell script
 
 .SH DESCRIPTION
 
-The \fIdbus-launch\fP command is used to start \fIdbus-daemon-1\fP
+The \fIdbus-launch\fP command is used to start \fIdbus-daemon\fP
 from a shell script. It would normally be called from a user's login
 scripts. Unlike the daemon itself, \fIdbus-launch\fP exits, so
 backticks or the $() construct can be used to read information from
@@ -40,7 +40,7 @@ know which shell your script is written in.
 
 .PP
 See http://www.freedesktop.org/software/dbus/ for more information
-about D-BUS. See also the man page for \fIdbus-daemon-1\fP.
+about D-BUS. See also the man page for \fIdbus-daemon\fP.
 
 .PP
 Here is an example of how to use \fIdbus-launch\fP with an 
@@ -76,7 +76,7 @@ Choose \-\-csh-syntax or \-\-sh-syntax based on the SHELL environment variable.
 .TP
 .I "--config-file=FILENAME"
 Pass \-\-config-file=FILENAME to the bus daemon, instead of passing it 
-the \-\-session argument. See the man page for dbus-daemon-1
+the \-\-session argument. See the man page for dbus-daemon
 
 .TP
 .I "--csh-syntax"
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 01d1a9f9..e24651a5 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -756,7 +756,7 @@ main (int argc, char **argv)
       verbose ("=== Bus exec process created\n");
       
       /* Now we are the bus process (well, almost;
-       * dbus-daemon-1 itself forks again)
+       * dbus-daemon itself forks again)
        */
       close (bus_pid_to_launcher_pipe[READ_END]);
       close (bus_address_to_launcher_pipe[READ_END]);
@@ -771,8 +771,8 @@ main (int argc, char **argv)
 
       verbose ("Calling exec()\n");
       
-      execlp ("dbus-daemon-1",
-              "dbus-daemon-1",
+      execlp ("dbus-daemon",
+              "dbus-daemon",
               "--fork",
               "--print-pid", write_pid_fd_as_string,
               "--print-address", write_address_fd_as_string,