diff -u gnome-speech-0.4.16/debian/rules gnome-speech-0.4.16/debian/rules --- gnome-speech-0.4.16/debian/rules +++ gnome-speech-0.4.16/debian/rules @@ -9,7 +9,7 @@ -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk # Ensure we do not accidentally pick up viavoice at package build time -DEB_CONFIGURE_EXTRA_FLAGS += --with-viavoice-dir=no +DEB_CONFIGURE_EXTRA_FLAGS += --with-viavoice-dir=no --with-speech-dispatcher # work around upstream bug DEB_MAKE_CLEAN_TARGET := clean reverted: --- gnome-speech-0.4.16/debian/gnome-speech-ibmtts.templates +++ gnome-speech-0.4.16.orig/debian/gnome-speech-ibmtts.templates @@ -1,8 +0,0 @@ -Template: gnome-speech-ibmtts/ibmtts_dir -Type: string -Default: /opt/IBM/ibmtts -_Description: IBMTTS installation directory: - IBMTTS include files and shared libraries are required To compile - the viavoice backend for GNOME Speech. - . - Please enter the directory where the IBMTTS engine is installed. diff -u gnome-speech-0.4.16/debian/gnome-speech-dectalk.prerm gnome-speech-0.4.16/debian/gnome-speech-dectalk.prerm --- gnome-speech-0.4.16/debian/gnome-speech-dectalk.prerm +++ gnome-speech-0.4.16/debian/gnome-speech-dectalk.prerm @@ -1,5 +1,7 @@ #!/bin/sh -e +#DEBHELPER# + rm -f /usr/bin/dectalk-synthesis-driver rm -f /usr/lib/bonobo/servers/GNOME_Speech_SynthesisDriver_Dectalk.server diff -u gnome-speech-0.4.16/debian/gnome-speech-swift.postinst gnome-speech-0.4.16/debian/gnome-speech-swift.postinst --- gnome-speech-0.4.16/debian/gnome-speech-swift.postinst +++ gnome-speech-0.4.16/debian/gnome-speech-swift.postinst @@ -2,6 +2,8 @@ set -e +#DEBHELPER# + . /usr/share/debconf/confmodule db_version 2.0 diff -u gnome-speech-0.4.16/debian/libgnome-speech7.install gnome-speech-0.4.16/debian/libgnome-speech7.install --- gnome-speech-0.4.16/debian/libgnome-speech7.install +++ gnome-speech-0.4.16/debian/libgnome-speech7.install @@ -1,4 +1,4 @@ debian/tmp/usr/lib/libgnomespeech*.so.* -debian/tmp/usr/bin/*-synthesis-driver +debian/tmp/usr/bin debian/tmp/usr/lib/bonobo/servers/* debian/tmp/usr/lib/orbit*/ reverted: --- gnome-speech-0.4.16/debian/gnome-speech-ibmtts.config +++ gnome-speech-0.4.16.orig/debian/gnome-speech-ibmtts.config @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -# Load Debconf -. /usr/share/debconf/confmodule -db_version 2.0 - -# Autodetect default for ibmtts_dir question -for dir in /opt/IBM/ibmtts /usr/local/IBM/ibmtts /usr/local/ibmtts; do - if [ -d "$dir" -a -d "$dir/inc" -a -f "$dir/inc/eci.h" -a -d "$dir/lib" -a -d "$dir/lib/libibmeci.so" ]; then - db_set gnome-speech-ibmtts/ibmtts_dir "$dir" - break - fi -done - -db_input medium gnome-speech-ibmtts/ibmtts_dir || true -db_go diff -u gnome-speech-0.4.16/debian/changelog gnome-speech-0.4.16/debian/changelog --- gnome-speech-0.4.16/debian/changelog +++ gnome-speech-0.4.16/debian/changelog @@ -1,3 +1,23 @@ +gnome-speech (1:0.4.16-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + - libgnome-speech7: Mention all backends that are built. + - libgnome-speech-dev: Refer to libgnome-speech7 + - debian/libgnome-speech7.install: + - ship other drivers as well. + - Ship test-speech in main package, instead of -dev package. + - debian/rules: use --with-festival --with-speech-dispatcher + * debian/control: + - change Maintainer to Ubuntu Accessibility Developers + + * Completely drop gnome-speech-ibmtts for hardy, as a necessary + library to use ibmtts is no longer in the hardy archive. + * Added debhelper tokens where needed to satisfy lintian. + * Bumped debhelper to 5, to satisfy linda. + + -- Luke Yelavich Mon, 12 Nov 2007 13:28:14 +1100 + gnome-speech (1:0.4.16-2) unstable; urgency=low * Update french debconf template translation (Closes: Bug#446937). @@ -40,6 +60,44 @@ -- Mario Lang Sun, 14 Oct 2007 14:20:00 +0200 +gnome-speech (1:0.4.16-0ubuntu2) gutsy; urgency=low + + * Rebuild to build against the new espeak + + -- Sarah Hobbs Wed, 12 Sep 2007 12:25:55 +1000 + +gnome-speech (1:0.4.16-0ubuntu1) gutsy; urgency=low + + * New upstream release. + + -- Luke Yelavich Fri, 24 Aug 2007 20:40:45 +1000 + +gnome-speech (1:0.4.15-0ubuntu1) gutsy; urgency=low + + * New upstream release. + * debian/rules: include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk + * debian/control.in: added libgnomespeech-dev Depends on libgnomespeech7. + + -- Daniel Holbach Wed, 18 Jul 2007 17:40:05 +0200 + +gnome-speech (1:0.4.14-0ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - New upstream release. + - debian/control: + - move festival from Depends to Recommends. + - libgnome-speech7: Mention all backends that are built. + - libgnome-speech-dev: Refer to libgnome-speech7 + - debian/libgnome-speech7.install: + - ship other drivers as well. + - Ship test-speech in main package, instead of -dev package. + - debian/rules: use --with-festival --with-speech-dispatcher + * debian/control: + - change Maintainer to Ubuntu Accessibility Developers + + + -- Luke Yelavich Fri, 22 Jun 2007 12:19:05 +1000 + gnome-speech (1:0.4.13-2) unstable; urgency=low [ Luke Yelavich ] @@ -92,6 +150,23 @@ -- Mario Lang Tue, 22 May 2007 11:42:52 +0200 +gnome-speech (1:0.4.12-3ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + - move festival from Depends to Recommends. + - libgnome-speech7: Mention all backends that are built. + - libgnome-speech-dev: Refer to libgnome-speech7 + - debian/libgnome-speech7.install: + - ship other drivers as well. + - Ship test-speech in main package, instead of -dev package. + - debian/rules: use --with-festival --with-speech-dispatcher + * debian/control: + - change Maintainer to Ubuntu Accessibility Developers + + + -- Luke Yelavich Tue, 22 May 2007 19:15:43 +1000 + gnome-speech (1:0.4.12-3) unstable; urgency=low * Build-Depends on libespeak-dev should be >= 1.22. @@ -110,6 +185,13 @@ -- Mario Lang Tue, 15 May 2007 00:53:43 +0200 +gnome-speech (1:0.4.12-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - Fix to support festival languages without dialects. + + -- Daniel Holbach Wed, 16 May 2007 10:37:42 +0200 + gnome-speech (1:0.4.11-1) experimental; urgency=low * New upstream release: @@ -122,6 +204,21 @@ -- Mario Lang Fri, 11 May 2007 22:59:29 +0200 +gnome-speech (1:0.4.11-0ubuntu2) gutsy; urgency=low + + * Resynchronized with Debian, remaining Ubuntu changes are: + - newer version of gnome-speech. + - debian/control: + - added libespeak-dev (>= 1.18) to Build-Depends. + - move festival from Depends to Recommends. + - debian/libgnome-speech3*.install: ship other drivers as well. + - debian/rules: use --with-festival --with-speech-dispatcher + * debian/control: + - change Maintainer to Ubuntu Accessibility Developers + + + -- Daniel Holbach Thu, 26 Apr 2007 12:02:09 +0200 + gnome-speech (1:0.3.10-2) unstable; urgency=low * Apply encoding patch for Italian festival voices (Closes: Bug#375874). diff -u gnome-speech-0.4.16/debian/control.in gnome-speech-0.4.16/debian/control.in --- gnome-speech-0.4.16/debian/control.in +++ gnome-speech-0.4.16/debian/control.in @@ -1,10 +1,11 @@ Source: gnome-speech Section: libs Priority: optional -Maintainer: Mario Lang +Maintainer: Ubuntu Accessibility Developers +XSBC-Original-Maintainer: Mario Lang Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.2.11), - debhelper (>= 4.0.0), + debhelper (>= 5.0.0), gnome-pkg-tools (>= 0.10), libbonobo2-dev (>= 2.6.0), liborbit2-dev (>= 1:2.10.0), libespeak-dev (>= 1.29), @@ -22,14 +23,15 @@ to convert text into speech, as well as speech input. . Multiple backends are supported by the GNOME Speech library. - The Festival and Espeak backends are provided by default in this package; - other backends that require prorietary software are available via separate - packages (gnome-speech-dectalk, gnome-speech-ibmtts and gnome-speech-swift). + The Festival, Espeak and speech-dispatcher backends are provided + by default in this package; other backends that require proprietary + software are available via separate packages (gnome-speech-dectalk + and gnome-speech-swift). Package: libgnome-speech-dev Section: devel Architecture: any -Depends: ${shlibs:Depends}, pkg-config +Depends: libgnome-speech7 (= ${binary:Version}), pkg-config Description: GNOME text-to-speech library (development headers) The GNOME Speech library gives a simple yet general API for programs to convert text into speech, as well as speech input. @@ -83,23 +84,0 @@ - -Package: gnome-speech-ibmtts -Section: contrib/libs -Architecture: i386 -Depends: ${misc:Depends}, - gcc, - libgnome-speech-dev (= ${binary:Version}), - liborbit2-dev, - libglib2.0-dev, - libbonobo2-dev -Description: GNOME text-to-speech library (IBMTTS engine support) - The GNOME Speech library gives a simple yet general API for programs - to convert text into speech, as well as speech input. - . - This package provides the source code required to compile a driver - for the commercial IBMTTS speech synthesis engine available - from http://ttsynth.com/. - Upon installation, it will automatically attempt to compile and install - the voiavoice-synthesis-driver binary required to use GNOME Speech with - IBMTTS. - . - This package is only useful if the IBMTTS (TTSynth) engine is already - installed on the system. diff -u gnome-speech-0.4.16/debian/gnome-speech-dectalk.postinst gnome-speech-0.4.16/debian/gnome-speech-dectalk.postinst --- gnome-speech-0.4.16/debian/gnome-speech-dectalk.postinst +++ gnome-speech-0.4.16/debian/gnome-speech-dectalk.postinst @@ -2,6 +2,8 @@ set -e +#DEBHELPER# + . /usr/share/debconf/confmodule db_version 2.0 diff -u gnome-speech-0.4.16/debian/libgnome-speech-dev.install gnome-speech-0.4.16/debian/libgnome-speech-dev.install --- gnome-speech-0.4.16/debian/libgnome-speech-dev.install +++ gnome-speech-0.4.16/debian/libgnome-speech-dev.install @@ -6 +5,0 @@ -debian/tmp/usr/bin/test-speech reverted: --- gnome-speech-0.4.16/debian/gnome-speech-ibmtts.install +++ gnome-speech-0.4.16.orig/debian/gnome-speech-ibmtts.install @@ -1 +0,0 @@ -drivers/viavoice/*.{c,h,server.in} usr/share/gnome-speech/sources/viavoice reverted: --- gnome-speech-0.4.16/debian/gnome-speech-ibmtts.prerm +++ gnome-speech-0.4.16.orig/debian/gnome-speech-ibmtts.prerm @@ -1,6 +0,0 @@ -#!/bin/sh -e - -rm -f /usr/bin/viavoice-synthesis-driver -rm -f /usr/lib/bonobo/servers/GNOME_Speech_SynthesisDriver_Viavoice.server - -exit 0 diff -u gnome-speech-0.4.16/debian/control gnome-speech-0.4.16/debian/control --- gnome-speech-0.4.16/debian/control +++ gnome-speech-0.4.16/debian/control @@ -1,10 +1,11 @@ Source: gnome-speech Section: libs Priority: optional -Maintainer: Mario Lang -Uploaders: Debian GNOME Maintainers +Maintainer: Ubuntu Accessibility Developers +XSBC-Original-Maintainer: Mario Lang +Uploaders: Debian GNOME Maintainers , Mario Lang Build-Depends: cdbs (>= 0.2.11), - debhelper (>= 4.0.0), + debhelper (>= 5.0.0), gnome-pkg-tools (>= 0.10), libbonobo2-dev (>= 2.6.0), liborbit2-dev (>= 1:2.10.0), libespeak-dev (>= 1.29), @@ -22,14 +23,15 @@ to convert text into speech, as well as speech input. . Multiple backends are supported by the GNOME Speech library. - The Festival and Espeak backends are provided by default in this package; - other backends that require prorietary software are available via separate - packages (gnome-speech-dectalk, gnome-speech-ibmtts and gnome-speech-swift). + The Festival, Espeak and speech-dispatcher backends are provided + by default in this package; other backends that require proprietary + software are available via separate packages (gnome-speech-dectalk + and gnome-speech-swift). Package: libgnome-speech-dev Section: devel Architecture: any -Depends: ${shlibs:Depends}, pkg-config +Depends: libgnome-speech7 (= ${binary:Version}), pkg-config Description: GNOME text-to-speech library (development headers) The GNOME Speech library gives a simple yet general API for programs to convert text into speech, as well as speech input. @@ -83,23 +84,0 @@ - -Package: gnome-speech-ibmtts -Section: contrib/libs -Architecture: i386 -Depends: ${misc:Depends}, - gcc, - libgnome-speech-dev (= ${binary:Version}), - liborbit2-dev, - libglib2.0-dev, - libbonobo2-dev -Description: GNOME text-to-speech library (IBMTTS engine support) - The GNOME Speech library gives a simple yet general API for programs - to convert text into speech, as well as speech input. - . - This package provides the source code required to compile a driver - for the commercial IBMTTS speech synthesis engine available - from http://ttsynth.com/. - Upon installation, it will automatically attempt to compile and install - the voiavoice-synthesis-driver binary required to use GNOME Speech with - IBMTTS. - . - This package is only useful if the IBMTTS (TTSynth) engine is already - installed on the system. diff -u gnome-speech-0.4.16/debian/gnome-speech-swift.prerm gnome-speech-0.4.16/debian/gnome-speech-swift.prerm --- gnome-speech-0.4.16/debian/gnome-speech-swift.prerm +++ gnome-speech-0.4.16/debian/gnome-speech-swift.prerm @@ -1,5 +1,7 @@ #!/bin/sh -e +#DEBHELPER# + rm -f /usr/bin/swift-synthesis-driver rm -f /usr/lib/bonobo/servers/GNOME_Speech_SynthesisDriver_Swift.server [ -L /etc/swift.xml ] && rm /etc/swift.xml reverted: --- gnome-speech-0.4.16/debian/gnome-speech-ibmtts.postinst +++ gnome-speech-0.4.16.orig/debian/gnome-speech-ibmtts.postinst @@ -1,22 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/debconf/confmodule -db_version 2.0 - -srcdir=/usr/share/gnome-speech/sources/viavoice -if [ "$1" = "configure" ]; then - db_get gnome-speech-ibmtts/ibmtts_dir - ibmtts_dir="$RET" - if [ -d "$ibmtts_dir" -a -d "$ibmtts_dir/inc" -a -f "$ibmtts_dir/inc/eci.h" -a -d "$ibmtts_dir/lib" ]; then - # compile code here - ibmtts_CFLAGS="-I$srcdir -I/usr/include/gnome-speech-1.0 -I$ibmtts_dir/inc -DORBIT2=1 -pthread -I/usr/include/bonobo-activation-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -Wall -g -O2" - gcc $ibmtts_CFLAGS -o /usr/bin/viavoice-synthesis-driver \ - $srcdir/viavoicesynthesisdriver.c $srcdir/viavoicespeaker.c \ - -Wl,--export-dynamic -lgnomespeech -lbonobo-2 -lbonobo-activation -lgmodule-2.0 -ldl -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -L$ibmtts_dir/lib -libmeci -lm - sed -e 's,@prefix@,/usr,' \ - <$srcdir/GNOME_Speech_SynthesisDriver_Viavoice.server.in \ - >/usr/lib/bonobo/servers/GNOME_Speech_SynthesisDriver_Viavoice.server - fi -fi