[Pkg-voip-commits] r1228 - in kphone/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2006-02-04 03:06:06 +0000 (Sat, 04 Feb 2006)
New Revision: 1228

Added:
   kphone/trunk/debian/patches/bug_342555_message_5.diff
Removed:
   kphone/trunk/debian/patches/pending/
Modified:
   kphone/trunk/debian/changelog
Log:
releasing version 1:4.2-5

Modified: kphone/trunk/debian/changelog
===================================================================
--- kphone/trunk/debian/changelog	2006-02-04 02:48:31 UTC (rev 1227)
+++ kphone/trunk/debian/changelog	2006-02-04 03:06:06 UTC (rev 1228)
@@ -1,10 +1,10 @@
 kphone (1:4.2-5) unstable; urgency=low
 
   * Switch to cdbs
-  * Makefile should not strip binaries [patch] (Closes: #322451)
-  * KPhone: crash after doubleclick (Closes: #309638)
-  * Hang on connecting (Closes: #342555)
-  * FTBFS on GNU/kFreeBSD (Closes: #336854)
+  * Include patches for:
+    - Makefile should not strip binaries [patch] (Closes: #322451)
+    - Hang on connecting (Closes: #342555)
+    - FTBFS on GNU/kFreeBSD (Closes: #336854)
 
  -- Mark Purcell <msp at debian.org>  Sat,  4 Feb 2006 09:42:08 +1100
 

Copied: kphone/trunk/debian/patches/bug_342555_message_5.diff (from rev 1227, kphone/trunk/debian/patches/pending/bug_342555_message_5.diff)
===================================================================
--- kphone/trunk/debian/patches/pending/bug_342555_message_5.diff	2006-02-04 02:48:31 UTC (rev 1227)
+++ kphone/trunk/debian/patches/bug_342555_message_5.diff	2006-02-04 03:06:06 UTC (rev 1228)
@@ -0,0 +1,18 @@
+--- kphone/callaudio.cpp.orig	2005-06-21 21:14:49.000000000 +1000
++++ kphone/callaudio.cpp	2006-02-04 14:00:00.000000000 +1100
+@@ -635,9 +635,12 @@
+ 			if( !sdpm.isOnHold() ) {
+ 				if( output ) {
+ 					output->setCodec( getRtpCodec(), getRtpCodecNum() );
+-					audioIn();
+-					output->start();
+-					input->start();
++					if (!input)
++						audioIn();
++					if (!input->running ()) {
++						output->start();
++						input->start();
++					}
+ 				} else if( jack_audioout ) {
+ 
+ //					jack_audioout->setCodec( getRtpCodec(), getRtpCodecNum() );