Package: speech-dispatcher
Version: 0.6.7-8
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for speech-dispatcher (versioned as 0.6.7-8.1).
A dsc can be found on:
http://mentors.debian.net/debian/pool/main/s/speech-dispatcher/speech-dispatcher_0.6.7-8.1.dsc
Regards.
Martijn van Brummelen
diff -u speech-dispatcher-0.6.7/src/modules/Makefile.in speech-dispatcher-0.6.7/src/modules/Makefile.in
--- speech-dispatcher-0.6.7/src/modules/Makefile.in
+++ speech-dispatcher-0.6.7/src/modules/Makefile.in
@@ -290,7 +290,7 @@
top_srcdir = @top_srcdir@
inc_local = "-I$(top_srcdir)/intl/"
EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h ivona_client.c dummy.c dummy-message.wav
-AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir)
+AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir) -D_GNU_SOURCE
snddata_DATA = dummy-message.wav
sd_flite_SOURCES = flite.c module_utils.c module_utils.h
sd_flite_LDFLAGS = -rpath '$(spdlibdir)'
diff -u speech-dispatcher-0.6.7/src/c/clients/say/Makefile.in speech-dispatcher-0.6.7/src/c/clients/say/Makefile.in
--- speech-dispatcher-0.6.7/src/c/clients/say/Makefile.in
+++ speech-dispatcher-0.6.7/src/c/clients/say/Makefile.in
@@ -212,7 +212,7 @@
c_api = $(top_srcdir)/src/c/api
AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I/usr/include/ $(inc_local) @glib_include@ -I$(c_api)
spd_say_SOURCES = say.c options.c options.h $(c_api)/libspeechd.h
-spd_say_LDADD = $(c_api)/libspeechd.la
+spd_say_LDADD = $(c_api)/libspeechd.la -lpthread
all: all-am
.SUFFIXES:
diff -u speech-dispatcher-0.6.7/src/tests/Makefile.in speech-dispatcher-0.6.7/src/tests/Makefile.in
--- speech-dispatcher-0.6.7/src/tests/Makefile.in
+++ speech-dispatcher-0.6.7/src/tests/Makefile.in
@@ -230,15 +230,15 @@
c_api = $(top_srcdir)/src/c/api
AM_CFLAGS = -I$(c_api) -DLOCALEDIR=\"$(localedir)\" -I/usr/include/ $(inc_local) @glib_include@ -I../audio/
long_message_SOURCES = long_message.c $(c_api)/libspeechd.h
-long_message_LDADD = $(c_api)/libspeechd.la
+long_message_LDADD = $(c_api)/libspeechd.la -lpthread
clibrary_SOURCES = clibrary.c $(c_api)/libspeechd.h
-clibrary_LDADD = $(c_api)/libspeechd.la
+clibrary_LDADD = $(c_api)/libspeechd.la -lpthread
clibrary2_SOURCES = clibrary2.c $(c_api)/libspeechd.h
-clibrary2_LDADD = $(c_api)/libspeechd.la
+clibrary2_LDADD = $(c_api)/libspeechd.la -lpthread
connection_recovery_SOURCES = connection-recovery.c $(c_api)/libspeechd.h
-connection_recovery_LDADD = $(c_api)/libspeechd.la
+connection_recovery_LDADD = $(c_api)/libspeechd.la -lpthread
run_test_SOURCES = run_test.c $(c_api)/libspeechd.h
-run_test_LDADD = $(c_api)/libspeechd.la
+run_test_LDADD = $(c_api)/libspeechd.la -lpthread
EXTRA_DIST = *.test *.wav
all: all-am
diff -u speech-dispatcher-0.6.7/debian/init.d speech-dispatcher-0.6.7/debian/init.d
--- speech-dispatcher-0.6.7/debian/init.d
+++ speech-dispatcher-0.6.7/debian/init.d
@@ -2,10 +2,8 @@
### BEGIN INIT INFO
# Provides: speech-dispatcher
-# Required-Start:
-# Required-Stop:
-# Should-Start: festival
-# Should-Stop: festival
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Speech Dispatcher
diff -u speech-dispatcher-0.6.7/debian/changelog speech-dispatcher-0.6.7/debian/changelog
--- speech-dispatcher-0.6.7/debian/changelog
+++ speech-dispatcher-0.6.7/debian/changelog
@@ -1,3 +1,12 @@
+speech-dispatcher (0.6.7-8.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add 07_flite-1.4-fix.dpatch (thanks to Andres Mejia) (Closes: #577896).
+ * Fixed Lintian error (init.d-script-missing-dependency-on-remote_fs) by
+ modifing debian/init.d(Thanks to Petter Reinholdtsen) (Closes: #582167).
+
+ -- Martijn van Brummelen <mart...@brumit.nl> Sat, 29 May 2010 11:09:37 +0200
+
speech-dispatcher (0.6.7-8) unstable; urgency=low
* Link spd-say to libpthread; closes: #556369.
diff -u speech-dispatcher-0.6.7/debian/patches/00list speech-dispatcher-0.6.7/debian/patches/00list
--- speech-dispatcher-0.6.7/debian/patches/00list
+++ speech-dispatcher-0.6.7/debian/patches/00list
@@ -5,0 +6 @@
+07_flite-1.4-fix.dpatch
only in patch2:
unchanged:
--- speech-dispatcher-0.6.7.orig/debian/patches/07_flite-1.4-fix.dpatch
+++ speech-dispatcher-0.6.7/debian/patches/07_flite-1.4-fix.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_flite-1.4-fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix to build against flite-1.4.
+
+...@dpatch@
+diff --git a/src/modules/flite.c b/src/modules/flite.c
+index f9c8cb4..eeafaaa 100644
+--- a/src/modules/flite.c
++++ b/src/modules/flite.c
+@@ -60,7 +60,6 @@ static void flite_strip_silence(AudioTrack*);
+ static void* _flite_speak(void*);
+
+ /* Voice */
+-cst_voice *register_cmu_us_kal();
+ cst_voice *flite_voice;
+
+ int flite_stop = 0;
+@@ -105,7 +104,7 @@ module_init(char **status_info)
+
+ /* Init flite and register a new voice */
+ flite_init();
+- flite_voice = register_cmu_us_kal();
++ flite_voice = new_voice();
+
+ if (flite_voice == NULL){
+ DBG("Couldn't register the basic kal voice.\n");
+@@ -432,7 +431,7 @@ flite_set_voice(EVoiceType voice)
+ {
+ if (voice == MALE1){
+ free(flite_voice);
+- flite_voice = (cst_voice*) register_cmu_us_kal();
++ flite_voice = new_voice();
+ }
+ }
+
only in patch2:
unchanged:
--- speech-dispatcher-0.6.7.orig/doc/speech-dispatcher.info
+++ speech-dispatcher-0.6.7/doc/speech-dispatcher.info
@@ -1,8 +1,8 @@
-This is speech-dispatcher.info, produced by makeinfo version 4.11 from
+This is speech-dispatcher.info, produced by makeinfo version 4.13 from
speech-dispatcher.texi.
-INFO-DIR-SECTION SoundINFO-DIR-SECTION Development
-
+INFO-DIR-SECTION Sound
+INFO-DIR-SECTION Development
START-INFO-DIR-ENTRY
* Speech Dispatcher: (speech-dispatcher). Speech Dispatcher.
END-INFO-DIR-ENTRY
@@ -777,8 +777,9 @@
spd-conf -d
* Check the appropriate logfile in
- `~/.speech-dispatcher/logs/speechd.log' for user Speech Dispatcher
- or in `/var/log/speech-dispatcher/speechd.log'. Look for lines
+ `~/.speech-dispatcher/logs/speech-dispatcher.log' for user Speech
+ Dispatcher or in
+ `/var/log/speech-dispatcher/speech-dispatcher.log'. Look for lines
containing the string 'ERROR' and their surrounding contents. If
you hear no speech, restart Speech Dispatcher and look near the
end of the log file - before any attempts for synthesis of any
@@ -3024,8 +3025,7 @@
the list of all available parameters. *note Communication
Protocol for Output Modules::.
- An example from Festival output module:
- static void
+ An example from Festival output module: static void
festival_set_rate(signed int rate)
{
assert(rate >= -100 && rate <= +100);
@@ -4557,7 +4557,7 @@
* UPDATE_PARAMETER: Generic Macros and Functions.
(line 7)
* UPDATE_STRING_PARAMETER: Generic Macros and Functions.
- (line 41)
+ (line 40)
* user mapping: User Authentication. (line 14)
* void <1>: Memory Handling Functions.
(line 16)
@@ -4602,70 +4602,70 @@
Node: Running in a Custom Setup31483
Node: Setting Communication Port32001
Node: Troubleshooting32911
-Node: Configuration34988
-Node: Configuration file syntax36216
-Node: Configuration options37254
-Node: Audio Output Configuration37705
-Node: Client Specific Configuration38592
-Node: Output Modules Configuration40181
-Node: Loading Modules in speechd.conf41127
-Ref: AddModule41398
-Node: Configuration files of output modules42196
-Ref: AudioOutputMethod method42790
-Ref: AddVoice43497
-Node: Configuration of the Generic Output Module46323
-Node: Log Levels49917
-Node: Tools51140
-Node: spd-say51741
-Node: spd-conf51928
-Node: spd-send52898
-Node: Client Programming53313
-Node: C API54292
-Node: Initializing and Terminating in C54811
-Node: Speech Synthesis Commands in C58378
-Node: Speech output control commands in C61384
-Node: Characters and Keys in C66829
-Node: Sound Icons in C68525
-Node: Parameter Setting Commands in C69453
-Ref: spd_set_output_module70801
-Ref: spd_set_voice_type72568
-Ref: spd_set_synthesis_voice72969
-Node: Other Functions in C74434
-Node: Information Retrieval Commands in C74636
-Ref: spd_list_modules74949
-Ref: spd_list_voices75351
-Ref: spd_list_synthesis_voices76118
-Node: Event Notification and Index Marking in C77054
-Ref: SPDNotification77637
-Ref: SPDCallback78102
-Node: History Commands in C83237
-Node: Direct SSIP Communication in C83449
-Node: Python API86538
-Node: Guile API89617
-Node: Common Lisp API89920
-Node: Server Programming90216
-Node: Server Core90546
-Node: Output Modules93562
-Node: Basic Structure94042
-Node: Communication Protocol for Output Modules95353
-Ref: Events notification and index marking103543
-Node: How to Write New Output Module106118
-Node: The Skeleton of an Output Module108047
-Node: Output Module Functions114788
-Node: Module Utils Functions and Macros120182
-Node: Initialization Macros and Functions120939
-Node: Generic Macros and Functions122343
-Node: Functions used by module_main.c123947
-Node: Functions for use when talking to synthesizer125727
-Node: Multi-process output modules128542
-Node: Memory Handling Functions135995
-Node: Index Marks in Output Modules136763
-Node: Download and Contact138332
-Node: Reporting Bugs139161
-Node: How You Can Help142189
-Node: Appendices146303
-Node: GNU General Public License146469
-Node: GNU Free Documentation License165707
-Node: Index of Concepts188189
+Node: Configuration35013
+Node: Configuration file syntax36241
+Node: Configuration options37279
+Node: Audio Output Configuration37730
+Node: Client Specific Configuration38617
+Node: Output Modules Configuration40206
+Node: Loading Modules in speechd.conf41152
+Ref: AddModule41423
+Node: Configuration files of output modules42221
+Ref: AudioOutputMethod method42815
+Ref: AddVoice43522
+Node: Configuration of the Generic Output Module46348
+Node: Log Levels49942
+Node: Tools51165
+Node: spd-say51766
+Node: spd-conf51953
+Node: spd-send52923
+Node: Client Programming53338
+Node: C API54317
+Node: Initializing and Terminating in C54836
+Node: Speech Synthesis Commands in C58403
+Node: Speech output control commands in C61409
+Node: Characters and Keys in C66854
+Node: Sound Icons in C68550
+Node: Parameter Setting Commands in C69478
+Ref: spd_set_output_module70826
+Ref: spd_set_voice_type72593
+Ref: spd_set_synthesis_voice72994
+Node: Other Functions in C74459
+Node: Information Retrieval Commands in C74661
+Ref: spd_list_modules74974
+Ref: spd_list_voices75376
+Ref: spd_list_synthesis_voices76143
+Node: Event Notification and Index Marking in C77079
+Ref: SPDNotification77662
+Ref: SPDCallback78127
+Node: History Commands in C83262
+Node: Direct SSIP Communication in C83474
+Node: Python API86563
+Node: Guile API89642
+Node: Common Lisp API89945
+Node: Server Programming90241
+Node: Server Core90571
+Node: Output Modules93587
+Node: Basic Structure94067
+Node: Communication Protocol for Output Modules95378
+Ref: Events notification and index marking103568
+Node: How to Write New Output Module106143
+Node: The Skeleton of an Output Module108072
+Node: Output Module Functions114813
+Node: Module Utils Functions and Macros120207
+Node: Initialization Macros and Functions120964
+Node: Generic Macros and Functions122368
+Node: Functions used by module_main.c123967
+Node: Functions for use when talking to synthesizer125747
+Node: Multi-process output modules128562
+Node: Memory Handling Functions136015
+Node: Index Marks in Output Modules136783
+Node: Download and Contact138352
+Node: Reporting Bugs139181
+Node: How You Can Help142209
+Node: Appendices146323
+Node: GNU General Public License146489
+Node: GNU Free Documentation License165727
+Node: Index of Concepts188209
End Tag Table
only in patch2:
unchanged:
--- speech-dispatcher-0.6.7.orig/doc/stamp-vti
+++ speech-dispatcher-0.6.7/doc/stamp-vti
@@ -1,4 +1,4 @@
-...@set UPDATED 31 July 2008
-...@set UPDATED-MONTH July 2008
+...@set UPDATED 29 May 2010
+...@set UPDATED-MONTH May 2010
@set EDITION 0.6.7
@set VERSION 0.6.7
only in patch2:
unchanged:
--- speech-dispatcher-0.6.7.orig/doc/version.texi
+++ speech-dispatcher-0.6.7/doc/version.texi
@@ -1,4 +1,4 @@
-...@set UPDATED 31 July 2008
-...@set UPDATED-MONTH July 2008
+...@set UPDATED 29 May 2010
+...@set UPDATED-MONTH May 2010
@set EDITION 0.6.7
@set VERSION 0.6.7
