[Pkg-voip-commits] r5053 - in /iaxclient/trunk/debian: changelog patches/00list patches/220_audio_encode.dpatch patches/90_mixer.dpatch patches/speex.dpatch

[mikma-guest at alioth.debian.org]

Author: mikma-guest
Date: Thu Dec  6 12:19:31 2007
New Revision: 5053

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5053
Log:
  150_iax2_newjb, 220_audio_encode, 250_incoming_ringing, 200_version.

Removed:
    iaxclient/trunk/debian/patches/220_audio_encode.dpatch
    iaxclient/trunk/debian/patches/speex.dpatch
Modified:
    iaxclient/trunk/debian/changelog
    iaxclient/trunk/debian/patches/00list
    iaxclient/trunk/debian/patches/90_mixer.dpatch

Modified: iaxclient/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/iaxclient/trunk/debian/changelog?rev=5053&op=diff
==============================================================================
--- iaxclient/trunk/debian/changelog (original)
+++ iaxclient/trunk/debian/changelog Thu Dec  6 12:19:31 2007
@@ -1,4 +1,4 @@
-iaxclient (2.0.1-1) UNRELEASED; urgency=low
+iaxclient (2.0.2-1) UNRELEASED; urgency=low
 
   [ Kilian Krause ]
   * Add Homepage field as added in dpkg-dev 1.14.6.
@@ -8,7 +8,7 @@
   * Enable shared library, packaged in libiaxclient1.
   * Remove patches applied by upstream or not needed anymore: 10_autoconf,
     12_autoconf_gen, 14_autoconf_chmod, 40_fixes, 80_jiaxc, 110_xrcdirectory,
-    150_iax2_newjb, 250_incoming_ringing, 200_version.
+    150_iax2_newjb, 220_audio_encode, 250_incoming_ringing, 200_version.
   * Added Build-Depends: libogg-dev, libtheora-dev
   * iaxcomm.menu: Move to section "Applications/Network/Communication"
   * Fix ringbuffer on powerpc.

Modified: iaxclient/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/iaxclient/trunk/debian/patches/00list?rev=5053&op=diff
==============================================================================
--- iaxclient/trunk/debian/patches/00list (original)
+++ iaxclient/trunk/debian/patches/00list Thu Dec  6 12:19:31 2007
@@ -1,6 +1,4 @@
 13_config
 #50_wish
 90_mixer
-220_audio_encode
-speex
 powerpc

Modified: iaxclient/trunk/debian/patches/90_mixer.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/iaxclient/trunk/debian/patches/90_mixer.dpatch?rev=5053&op=diff
==============================================================================
--- iaxclient/trunk/debian/patches/90_mixer.dpatch (original)
+++ iaxclient/trunk/debian/patches/90_mixer.dpatch Thu Dec  6 12:19:31 2007
@@ -5,18 +5,10 @@
 ## DP: fixed #321305
 
 @DPATCH@
-diff -urNad iaxclient-2.0.0~/lib/audio_portaudio.c iaxclient-2.0.0/lib/audio_portaudio.c
---- iaxclient-2.0.0~/lib/audio_portaudio.c	2007-10-05 19:41:51.000000000 +0200
-+++ iaxclient-2.0.0/lib/audio_portaudio.c	2007-10-06 00:09:51.000000000 +0200
-@@ -133,6 +133,7 @@
- static int virtualMonoOut;
- 
- static int running;
-+static int initialized = 0;
- 
- static struct iaxc_sound *sounds;
- static int  nextSoundId = 1;
-@@ -789,12 +790,12 @@
+diff -urNad iaxclient-2.0.2~/lib/audio_portaudio.c iaxclient-2.0.2/lib/audio_portaudio.c
+--- iaxclient-2.0.2~/lib/audio_portaudio.c	2007-11-28 22:03:29.000000000 +0100
++++ iaxclient-2.0.2/lib/audio_portaudio.c	2007-12-06 12:58:06.000000000 +0100
+@@ -789,12 +789,12 @@
  	if ( Pa_StartStream(iStream) != paNoError )
  		return -1;
  
@@ -31,7 +23,7 @@
  		if ( err != paNoError )
  		{
  			Pa_StopStream(iStream);
-@@ -844,11 +845,13 @@
+@@ -844,11 +844,13 @@
  		 * much more gracefully */
  		Px_SetMicrophoneBoost( iMixer, 0 );
  
@@ -45,11 +37,3 @@
  		mixers_initialized = 1;
  	}
  
-@@ -969,6 +972,7 @@
- 
- static int pa_destroy(struct iaxc_audio_driver *d)
- {
-+	initialized = 0;
- 	return Pa_Terminate();
- }
-