move speechd.conf to speech-dispatcher.conf

3 files changed, 52 insertions, 8 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index 785034cd337e..0e9d4a628fef 100644
--- a/app-accessibility/speech-dispatcher/ChangeLog
+++ b/app-accessibility/speech-dispatcher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/speech-dispatcher
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.4 2004/04/05 22:44:25 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.5 2004/05/01 18:01:45 squinky86 Exp $
+
+  01 May 2004; Jon Hood <squinky86@gentoo.org>
+  files/speech-dispatcher-0.3-gentoo.patch:
+  move speechd.conf to speech-dispatcher.conf
 
 *speech-dispatcher-0.3 (05 Apr 2004)
   05 Apr 2004; Jon Hood <squinky86@gentoo.org>
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 7a151a819bd9..cc348fdd323e 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -5,5 +5,5 @@ MD5 84ffd00e4b6abdf6f947fd470b810d71 metadata.xml 249
 MD5 71d875960a2c5f4bb45b4bb4a18bbcb2 files/digest-speech-dispatcher-0.3 73
 MD5 6dc3b85b3d0bdff46846556206bbded1 files/speech-dispatcher-0.2-gentoo.patch 2251
 MD5 078d5c317522b72b8d9aa82719ee3440 files/digest-speech-dispatcher-0.2-r1 63
-MD5 b7371b27aba928026100f7166b2efa65 files/speech-dispatcher-0.3-gentoo.patch 1310
+MD5 0b47aa388bba472bb4dc934c1d99a47f files/speech-dispatcher-0.3-gentoo.patch 2891
 MD5 d693a3d215850d96ac42347e854e40bd files/speech-dispatcher 670
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.3-gentoo.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.3-gentoo.patch
index cc3cbd237f14..34cb78262572 100644
--- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.3-gentoo.patch
+++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.3-gentoo.patch
@@ -1,6 +1,25 @@
-diff -Naur speechd-0.3.vanilla/config/speechd.conf.in speechd-0.3/config/speechd.conf.in
---- speechd-0.3.vanilla/config/speechd.conf.in	2004-02-13 08:55:01.000000000 -0600
-+++ speechd-0.3/config/speechd.conf.in	2004-04-04 15:10:25.767924376 -0500
+diff -Naur speech-dispatcher-0.3.vanilla/config/Makefile.am speech-dispatcher-0.3/config/Makefile.am
+--- speech-dispatcher-0.3.vanilla/config/Makefile.am	2003-10-07 16:52:00.000000000 +0000
++++ speech-dispatcher-0.3/config/Makefile.am	2004-04-12 12:54:15.052250800 +0000
+@@ -2,11 +2,11 @@
+ 
+ SUBDIRS= modules clients
+ 
+-all-local: speechd.conf
++all-local: speech-dispatcher.conf
+ 
+-speechd.conf: speechd.conf.in
+-	sed -e s:INCLUDE_PATH:\"$(spdconfdir)\":g speechd.conf.in > speechd.conf
++speech-dispatcher.conf: speechd.conf.in
++	sed -e s:INCLUDE_PATH:\"$(spdconfdir)\":g speechd.conf.in > speech-dispatcher.conf
+ 
+ 
+-spdconf_DATA= speechd.conf
++spdconf_DATA= speech-dispatcher.conf
+ EXTRA_DIST = speechd.conf.in
+diff -Naur speech-dispatcher-0.3.vanilla/config/speechd.conf.in speech-dispatcher-0.3/config/speechd.conf.in
+--- speech-dispatcher-0.3.vanilla/config/speechd.conf.in	2004-02-13 14:55:01.000000000 +0000
++++ speech-dispatcher-0.3/config/speechd.conf.in	2004-04-12 12:41:04.108492000 +0000
 @@ -28,7 +28,7 @@
  # Specify "stdout" for standard console output
  # or a full path to some file which the log should be written to.
@@ -17,9 +36,9 @@ diff -Naur speechd-0.3.vanilla/config/speechd.conf.in speechd-0.3/config/speechd
 -# Include "clients/emacs.conf"
 +Include "clients/emacs.conf"
  
-diff -Naur speechd-0.3.vanilla/configure.in speechd-0.3/configure.in
---- speechd-0.3.vanilla/configure.in	2004-03-30 18:30:08.000000000 -0600
-+++ speechd-0.3/configure.in	2004-04-04 15:09:32.947954232 -0500
+diff -Naur speech-dispatcher-0.3.vanilla/configure.in speech-dispatcher-0.3/configure.in
+--- speech-dispatcher-0.3.vanilla/configure.in	2004-03-31 00:30:08.000000000 +0000
++++ speech-dispatcher-0.3/configure.in	2004-04-12 12:41:04.111492000 +0000
 @@ -50,7 +50,7 @@
  AC_SUBST(spdconfdir)
  snddatadir="$datadir/sounds/speech-dispatcher/" 
@@ -29,3 +48,24 @@ diff -Naur speechd-0.3.vanilla/configure.in speechd-0.3/configure.in
  AC_SUBST(modulebindir)
  moduleconfdir="$sysconfdir/speech-dispatcher/modules/" 
  AC_SUBST(moduleconfdir)
+diff -Naur speech-dispatcher-0.3.vanilla/src/server/speechd.c speech-dispatcher-0.3/src/server/speechd.c
+--- speech-dispatcher-0.3.vanilla/src/server/speechd.c	2004-03-31 00:33:52.000000000 +0000
++++ speech-dispatcher-0.3/src/server/speechd.c	2004-04-12 12:45:41.593308424 +0000
+@@ -356,7 +356,7 @@
+ {
+     int START_NUM_FD = 16;
+     configfile_t *configfile = NULL;
+-    char *configfilename = SYS_CONF"/speechd.conf" ;
++    char *configfilename = SYS_CONF"/speech-dispatcher.conf" ;
+     int ret;
+     char *p;
+     int i;
+@@ -449,7 +449,7 @@
+ void
+ speechd_load_configuration(int sig)
+ {
+-    char *configfilename = SYS_CONF"/speechd.conf";
++    char *configfilename = SYS_CONF"/speech-dispatcher.conf";
+     configfile_t *configfile = NULL;
+ 
+     /* Clean previous configuration */