r25461 - in /desktop/unstable/gnome-speech/debian: changelog patches/ patches/01_festival_eof.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Oct 30 13:48:41 2010
New Revision: 25461

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25461
Log:
* Use simple-patchsys.
* 01_festival_eof.patch: patch from Samuel Thibault. Handle EOF on 
  sockets. Closes: #601171.

Added:
    desktop/unstable/gnome-speech/debian/patches/
    desktop/unstable/gnome-speech/debian/patches/01_festival_eof.patch
Modified:
    desktop/unstable/gnome-speech/debian/changelog
    desktop/unstable/gnome-speech/debian/rules

Modified: desktop/unstable/gnome-speech/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-speech/debian/changelog?rev=25461&op=diff
==============================================================================
--- desktop/unstable/gnome-speech/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-speech/debian/changelog [utf-8] Sat Oct 30 13:48:41 2010
@@ -5,6 +5,9 @@
 
   [ Josselin Mouette ]
   * vi.po: updated translation by Clytie Siddall. Closes: #601562.
+  * Use simple-patchsys.
+  * 01_festival_eof.patch: patch from Samuel Thibault. Handle EOF on 
+    sockets. Closes: #601171.
 
  -- Mario Lang <mlang at debian.org>  Sat, 24 Jul 2010 14:18:43 +0200
 

Added: desktop/unstable/gnome-speech/debian/patches/01_festival_eof.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-speech/debian/patches/01_festival_eof.patch?rev=25461&op=file
==============================================================================
--- desktop/unstable/gnome-speech/debian/patches/01_festival_eof.patch (added)
+++ desktop/unstable/gnome-speech/debian/patches/01_festival_eof.patch [utf-8] Sat Oct 30 13:48:41 2010
@@ -1,0 +1,22 @@
+--- ./drivers/festival/festivalsynthesisdriver.c.original	2010-10-24 01:53:20.000000000 +0200
++++ ./drivers/festival/festivalsynthesisdriver.c	2010-10-24 01:57:12.000000000 +0200
+@@ -928,7 +928,8 @@
+ {
+         g_assert (IS_FESTIVAL_SYNTHESIS_DRIVER (d) && ack && d->channel_sock);
+ 
+-	g_io_channel_read_line (d->channel_sock, ack, NULL, NULL, NULL);
++	if (g_io_channel_read_line (d->channel_sock, ack, NULL, NULL, NULL) == G_IO_STATUS_EOF)
++		festival_synthesis_driver_stop (d);
+ }
+ 
+ 
+@@ -938,7 +939,8 @@
+ {
+         g_assert (IS_FESTIVAL_SYNTHESIS_DRIVER (d) && ack && d->channel_pipe);
+ 
+-	g_io_channel_read_line (d->channel_pipe, ack, NULL, NULL, NULL);
++	if (g_io_channel_read_line (d->channel_pipe, ack, NULL, NULL, NULL) == G_IO_STATUS_EOF)
++		festival_synthesis_driver_stop (d);
+ }
+ 
+ 

Modified: desktop/unstable/gnome-speech/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-speech/debian/rules?rev=25461&op=diff
==============================================================================
--- desktop/unstable/gnome-speech/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-speech/debian/rules [utf-8] Sat Oct 30 13:48:41 2010
@@ -5,6 +5,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk