r11091 - in /desktop/unstable/gnome-speech/debian: gnome-speech-swift.config gnome-speech-swift.postinst gnome-speech-swift.prerm

[mlang at users.alioth.debian.org]

Author: mlang
Date: Tue May 22 11:15:58 2007
New Revision: 11091

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11091
Log:
More fixes to gnome-speech-swift.{config,prerm}

Modified:
    desktop/unstable/gnome-speech/debian/gnome-speech-swift.config
    desktop/unstable/gnome-speech/debian/gnome-speech-swift.postinst
    desktop/unstable/gnome-speech/debian/gnome-speech-swift.prerm

Modified: desktop/unstable/gnome-speech/debian/gnome-speech-swift.config
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-speech/debian/gnome-speech-swift.config?rev=11091&op=diff
==============================================================================
--- desktop/unstable/gnome-speech/debian/gnome-speech-swift.config (original)
+++ desktop/unstable/gnome-speech/debian/gnome-speech-swift.config Tue May 22 11:15:58 2007
@@ -7,8 +7,8 @@
 db_version 2.0
 
 # Autodetect default for swift_dir question
-for dir in /opt/swift /usr/local/swift /usr/{local/,}share/swift; do
-  if [ -d "$dir" -a -d "$dir/include" -a -f "$dir/include/swift.h" -a -d $"dir/lib" ]; then
+for dir in /{opt,usr/local,usr/{local/,}share}/swift; do
+  if [ -d "$dir" -a -d "$dir/include" -a -f "$dir/include/swift.h" -a -d "$dir/lib" ]; then
     db_set gnome-speech-swift/swift_dir "$dir"
     break
   fi

Modified: desktop/unstable/gnome-speech/debian/gnome-speech-swift.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-speech/debian/gnome-speech-swift.postinst?rev=11091&op=diff
==============================================================================
--- desktop/unstable/gnome-speech/debian/gnome-speech-swift.postinst (original)
+++ desktop/unstable/gnome-speech/debian/gnome-speech-swift.postinst Tue May 22 11:15:58 2007
@@ -15,8 +15,10 @@
     gcc $swift_CFLAGS -o /usr/bin/swift-synthesis-driver \
       $srcdir/swiftsynthesisdriver.c $srcdir/swiftspeaker.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$swift_dir/lib -lswift -lm
-    sed -e 's, at prefix@,/usr,' <$srcdir/GNOME_Speech_SynthesisDriver_Swift.server.in >/usr/lib/bonobo/servers/GNOME_Speech_SynthesisDriver_Swift.server
-    if [ "$swift_dir" != "/opt/swift" ]; then
+    sed -e 's, at prefix@,/usr,' \
+      <$srcdir/GNOME_Speech_SynthesisDriver_Swift.server.in \
+      >/usr/lib/bonobo/servers/GNOME_Speech_SynthesisDriver_Swift.server
+    if [ "$swift_dir" != "/opt/swift" -a ! -f /etc/swift.xml ]; then
       if [ ! -f /opt/swift/etc/swift.xml ]; then
         ln -s $swift_dir/etc/swift.xml /etc/swift.xml
       fi

Modified: desktop/unstable/gnome-speech/debian/gnome-speech-swift.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-speech/debian/gnome-speech-swift.prerm?rev=11091&op=diff
==============================================================================
--- desktop/unstable/gnome-speech/debian/gnome-speech-swift.prerm (original)
+++ desktop/unstable/gnome-speech/debian/gnome-speech-swift.prerm Tue May 22 11:15:58 2007
@@ -4,3 +4,5 @@
 rm -f /usr/lib/bonobo/servers/GNOME_Speech_SynthesisDriver_Swift.server
 [ -L /etc/swift.xml ] && rm /etc/swift.xml
 
+exit 0
+