[Pkg-voip-commits] r3013 - in iaxclient/trunk/debian: . patches
Mikael Magnusson
mikma-guest at alioth.debian.org
Sat Jan 13 17:45:53 CET 2007
Author: mikma-guest
Date: 2007-01-13 17:45:52 +0100 (Sat, 13 Jan 2007)
New Revision: 3013
Removed:
iaxclient/trunk/debian/patches/170_deadlock.dpatch
iaxclient/trunk/debian/patches/230_unicode.dpatch
iaxclient/trunk/debian/patches/260_timer.dpatch
iaxclient/trunk/debian/patches/ringbuffer_prefix.dpatch
Modified:
iaxclient/trunk/debian/changelog
iaxclient/trunk/debian/patches/00list
iaxclient/trunk/debian/patches/10_autoconf.dpatch
iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch
iaxclient/trunk/debian/patches/90_mixer.dpatch
Log:
* New upstream release.
* Remove patches applied by upstream: 230_unicode, 260_timer and
ringbuffer_prefix
Modified: iaxclient/trunk/debian/changelog
===================================================================
--- iaxclient/trunk/debian/changelog 2007-01-13 13:28:04 UTC (rev 3012)
+++ iaxclient/trunk/debian/changelog 2007-01-13 16:45:52 UTC (rev 3013)
@@ -1,6 +1,9 @@
-iaxclient (0.0+svn20060729-2) UNRELEASED; urgency=low
+iaxclient (0.0+svn20070113-1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * New upstream release.
+ * Remove patches applied by upstream: 230_unicode, 260_timer and
+ ringbuffer_prefix
-- Kilian Krause <kilian at debian.org> Wed, 3 Jan 2007 21:58:42 +0100
Modified: iaxclient/trunk/debian/patches/00list
===================================================================
--- iaxclient/trunk/debian/patches/00list 2007-01-13 13:28:04 UTC (rev 3012)
+++ iaxclient/trunk/debian/patches/00list 2007-01-13 16:45:52 UTC (rev 3013)
@@ -9,8 +9,5 @@
150_iax2_newjb
90_mixer
220_audio_encode
-230_unicode
250_incoming_ringing
200_version
-260_timer
-ringbuffer_prefix
Modified: iaxclient/trunk/debian/patches/10_autoconf.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/10_autoconf.dpatch 2007-01-13 13:28:04 UTC (rev 3012)
+++ iaxclient/trunk/debian/patches/10_autoconf.dpatch 2007-01-13 16:45:52 UTC (rev 3013)
@@ -7,9 +7,9 @@
## DP: ./debian/rules autoreconf
@DPATCH@
-diff -urNad iaxclient~/AUTHORS iaxclient/AUTHORS
---- iaxclient~/AUTHORS 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/AUTHORS 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/AUTHORS iaxclient-0.0+svn20061014/AUTHORS
+--- iaxclient-0.0+svn20061014~/AUTHORS 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/AUTHORS 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,8 @@
+Steve Kann <stevek at stevek.com>
+Shawn Lawrence <shawn.lawrence at terracecomm.com>
@@ -19,9 +19,9 @@
+Steven Sokol <ssokol at sokol-associates.com> [ Debugging, Blind Transfer ]
+Stephan Kauss <Stephan at kauss.org> [ 32-bit alignment for IAX2 ]
+Stephen Uhler <suhler at sun.com> [Solaris build, tkiaxphone]
-diff -urNad iaxclient~/COPYING iaxclient/COPYING
---- iaxclient~/COPYING 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/COPYING 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/COPYING iaxclient-0.0+svn20061014/COPYING
+--- iaxclient-0.0+svn20061014~/COPYING 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/COPYING 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
@@ -363,15 +363,15 @@
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
-diff -urNad iaxclient~/ChangeLog iaxclient/ChangeLog
---- iaxclient~/ChangeLog 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/ChangeLog 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/ChangeLog iaxclient-0.0+svn20061014/ChangeLog
+--- iaxclient-0.0+svn20061014~/ChangeLog 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/ChangeLog 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,2 @@
+
+
-diff -urNad iaxclient~/INSTALL iaxclient/INSTALL
---- iaxclient~/INSTALL 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/INSTALL 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/INSTALL iaxclient-0.0+svn20061014/INSTALL
+--- iaxclient-0.0+svn20061014~/INSTALL 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/INSTALL 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
@@ -602,24 +602,24 @@
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
-diff -urNad iaxclient~/Makefile.am iaxclient/Makefile.am
---- iaxclient~/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/Makefile.am 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/Makefile.am iaxclient-0.0+svn20061014/Makefile.am
+--- iaxclient-0.0+svn20061014~/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/Makefile.am 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,5 @@
+ACLOCAL_AMFLAGS = -I macros
+
+SUBDIRS = lib simpleclient
+
+#EXTRA_DIST += iaxclient conf
-diff -urNad iaxclient~/NEWS iaxclient/NEWS
---- iaxclient~/NEWS 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/NEWS 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/NEWS iaxclient-0.0+svn20061014/NEWS
+--- iaxclient-0.0+svn20061014~/NEWS 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/NEWS 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,2 @@
+
+
-diff -urNad iaxclient~/autogen.sh iaxclient/autogen.sh
---- iaxclient~/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/autogen.sh 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/autogen.sh iaxclient-0.0+svn20061014/autogen.sh
+--- iaxclient-0.0+svn20061014~/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/autogen.sh 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
@@ -633,9 +633,9 @@
+ ./config.status --recheck
+ ./config.status
+fi
-diff -urNad iaxclient~/clean.sh iaxclient/clean.sh
---- iaxclient~/clean.sh 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/clean.sh 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/clean.sh iaxclient-0.0+svn20061014/clean.sh
+--- iaxclient-0.0+svn20061014~/clean.sh 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/clean.sh 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,6 @@
+#!/bin/sh
+
@@ -643,14 +643,14 @@
+
+rm -f {.,lib,simpleclient,simpleclient/iaxcomm,simpleclient/iaxphone,simpleclient/testcall,simpleclient/tkphone,simpleclient/WinIAX,simpleclient/wx}/Makefile.in
+rm -rf autom4te.cache
-diff -urNad iaxclient~/configure.ac iaxclient/configure.ac
---- iaxclient~/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/configure.ac 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/configure.ac iaxclient-0.0+svn20061014/configure.ac
+--- iaxclient-0.0+svn20061014~/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/configure.ac 2006-10-14 09:48:03.000000000 +0200
@@ -0,0 +1,372 @@
+dnl Copyright (C) 2004-2005 Mikael Magnusson <mikma at users.sourceforge.net>
+
+AC_PREREQ(2.59)
-+AC_INIT([iaxclient], 0.0+svn20060729)
++AC_INIT([iaxclient], 0.0+svn20070113)
+AC_CONFIG_SRCDIR([lib/iaxclient.h])
+AC_CONFIG_MACRO_DIR([macros])
+AM_INIT_AUTOMAKE
@@ -1019,9 +1019,9 @@
+AC_OUTPUT
+
+AC_MSG_NOTICE([Configured clients: $clients])
-diff -urNad iaxclient~/lib/Makefile.am iaxclient/lib/Makefile.am
---- iaxclient~/lib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/lib/Makefile.am 2006-07-29 22:23:13.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/lib/Makefile.am iaxclient-0.0+svn20061014/lib/Makefile.am
+--- iaxclient-0.0+svn20061014~/lib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/lib/Makefile.am 2006-10-14 09:47:40.000000000 +0200
@@ -0,0 +1,288 @@
+if USE_LOCAL_PORTAUDIO
+ SUBDIRS = portaudio
@@ -1102,10 +1102,6 @@
+NODIST_SRCS += $(SRCS_ILBC)
+endif USE_LOCAL_ILBC
+
-+if JITTERBUF
-+SRCS += jitterbuf.c
-+endif JITTERBUF
-+
+SRCS_LIBGSM= \
+ gsm/src/add.c \
+ gsm/src/code.c \
@@ -1282,6 +1278,10 @@
+ libiax2/src/iax-client.h \
+ libiax2/src/md5.h
+
++if JITTERBUF
++SRCS_IAX2 += libiax2/src/jitterbuf.c
++endif JITTERBUF
++
+plat:
+ echo Platform is $(OSTYPE)
+ echo SRCS are $(SRCS) $(NOINST_SRCS)
@@ -1311,9 +1311,9 @@
+portmixer/px_tests portmixer/px_unix_oss/Makefile \
+portmixer/px_win_wmme/Makefile portmixer/winproj libiax sox
+endif
-diff -urNad iaxclient~/macros/gsm.m4 iaxclient/macros/gsm.m4
---- iaxclient~/macros/gsm.m4 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/macros/gsm.m4 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/macros/gsm.m4 iaxclient-0.0+svn20061014/macros/gsm.m4
+--- iaxclient-0.0+svn20061014~/macros/gsm.m4 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/macros/gsm.m4 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,63 @@
+dnl 20041024 Downloaded from http://digium-cvs.netmonks.ca/viewcvs.cgi/*checkout*/gnophone/m4/gsm.m4?rev=1.2
+dnl This is a little s script written by Rob Flynn of Linux Support Services, Inc.
@@ -1378,9 +1378,9 @@
+fi
+
+])
-diff -urNad iaxclient~/macros/iax.m4 iaxclient/macros/iax.m4
---- iaxclient~/macros/iax.m4 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/macros/iax.m4 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/macros/iax.m4 iaxclient-0.0+svn20061014/macros/iax.m4
+--- iaxclient-0.0+svn20061014~/macros/iax.m4 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/macros/iax.m4 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,166 @@
+# 20041025 Mikael Magnusson modifications
+# 20041024 Downloaded from http://digium-cvs.netmonks.ca/viewcvs.cgi/*checkout*/gnophone/m4/iax.m4?rev=1.2
@@ -1548,9 +1548,9 @@
+ AC_SUBST(IAX_LIBS)
+ rm -f conf.iaxtest
+])
-diff -urNad iaxclient~/macros/iax2.m4 iaxclient/macros/iax2.m4
---- iaxclient~/macros/iax2.m4 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/macros/iax2.m4 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/macros/iax2.m4 iaxclient-0.0+svn20061014/macros/iax2.m4
+--- iaxclient-0.0+svn20061014~/macros/iax2.m4 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/macros/iax2.m4 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,166 @@
+# 20041024 Mikael Magnusson
+# 20041024 Downloaded from http://digium-cvs.netmonks.ca/viewcvs.cgi/*checkout*/gnophone/m4/iax.m4?rev=1.2
@@ -1718,9 +1718,9 @@
+ AC_SUBST(IAX2_LIBS)
+ rm -f conf.iaxtest
+])
-diff -urNad iaxclient~/macros/portaudio.m4 iaxclient/macros/portaudio.m4
---- iaxclient~/macros/portaudio.m4 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/macros/portaudio.m4 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/macros/portaudio.m4 iaxclient-0.0+svn20061014/macros/portaudio.m4
+--- iaxclient-0.0+svn20061014~/macros/portaudio.m4 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/macros/portaudio.m4 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,132 @@
+# 2006-07-29 Mikael Magnusson updated to V19
+# 2004-10-25 Mikael Magnusson stolen from speex.m4
@@ -1854,9 +1854,9 @@
+ AC_SUBST(PORTAUDIO_CFLAGS)
+ AC_SUBST(PORTAUDIO_LIBS)
+])
-diff -urNad iaxclient~/macros/speex.m4 iaxclient/macros/speex.m4
---- iaxclient~/macros/speex.m4 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/macros/speex.m4 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/macros/speex.m4 iaxclient-0.0+svn20061014/macros/speex.m4
+--- iaxclient-0.0+svn20061014~/macros/speex.m4 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/macros/speex.m4 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,148 @@
+# 2004-10-25 Modified by Mikael Magnusson
+# Configure paths for libspeex
@@ -2006,16 +2006,16 @@
+ AC_SUBST(SPEEX_LIBS)
+ rm -f conf.speextest
+])
-diff -urNad iaxclient~/simpleclient/Makefile.am iaxclient/simpleclient/Makefile.am
---- iaxclient~/simpleclient/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/Makefile.am 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/Makefile.am iaxclient-0.0+svn20061014/simpleclient/Makefile.am
+--- iaxclient-0.0+svn20061014~/simpleclient/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/Makefile.am 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,3 @@
+SUBDIRS = $(CLIENTS)
+
+EXTRA_DIST = win32
-diff -urNad iaxclient~/simpleclient/WinIAX/Makefile.am iaxclient/simpleclient/WinIAX/Makefile.am
---- iaxclient~/simpleclient/WinIAX/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/WinIAX/Makefile.am 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/WinIAX/Makefile.am iaxclient-0.0+svn20061014/simpleclient/WinIAX/Makefile.am
+--- iaxclient-0.0+svn20061014~/simpleclient/WinIAX/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/WinIAX/Makefile.am 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,15 @@
+bin_PROGRAMS = WinIAX
+
@@ -2032,9 +2032,9 @@
+ $(RCCOMPILE) -o $@ -i $<
+
+EXTRA_DIST = ReadMe.txt WinIAX.dsp WinIAX.dsw
-diff -urNad iaxclient~/simpleclient/iaxcomm/Makefile.am iaxclient/simpleclient/iaxcomm/Makefile.am
---- iaxclient~/simpleclient/iaxcomm/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/iaxcomm/Makefile.am 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/iaxcomm/Makefile.am iaxclient-0.0+svn20061014/simpleclient/iaxcomm/Makefile.am
+--- iaxclient-0.0+svn20061014~/simpleclient/iaxcomm/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/iaxcomm/Makefile.am 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,88 @@
+PROG=iaxcomm
+IAXCOMM_VERSION=1.1.0final
@@ -2124,9 +2124,9 @@
+endif MACOSX
+
+EXTRA_DIST = QUICKSTART ring.raw
-diff -urNad iaxclient~/simpleclient/iaxphone/Makefile.am iaxclient/simpleclient/iaxphone/Makefile.am
---- iaxclient~/simpleclient/iaxphone/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/iaxphone/Makefile.am 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/iaxphone/Makefile.am iaxclient-0.0+svn20061014/simpleclient/iaxphone/Makefile.am
+--- iaxclient-0.0+svn20061014~/simpleclient/iaxphone/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/iaxphone/Makefile.am 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,51 @@
+PROG=iaxphone
+
@@ -2179,9 +2179,9 @@
+ $(INSTALL_PROGRAM) $(PROG) "`pwd`/$@/Contents/MacOS/$(PROG)"
+
+endif MACOSX
-diff -urNad iaxclient~/simpleclient/testcall/Makefile.am iaxclient/simpleclient/testcall/Makefile.am
---- iaxclient~/simpleclient/testcall/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/testcall/Makefile.am 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/testcall/Makefile.am iaxclient-0.0+svn20061014/simpleclient/testcall/Makefile.am
+--- iaxclient-0.0+svn20061014~/simpleclient/testcall/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/testcall/Makefile.am 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,12 @@
+bin_PROGRAMS=testcall
+testcall_SOURCES=testcall.c
@@ -2195,9 +2195,9 @@
+
+EXTRA_DIST = .cvsignore
+
-diff -urNad iaxclient~/simpleclient/tkphone/Makefile.am iaxclient/simpleclient/tkphone/Makefile.am
---- iaxclient~/simpleclient/tkphone/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/tkphone/Makefile.am 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/tkphone/Makefile.am iaxclient-0.0+svn20061014/simpleclient/tkphone/Makefile.am
+--- iaxclient-0.0+svn20061014~/simpleclient/tkphone/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/tkphone/Makefile.am 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,29 @@
+# Should support LINUX MACOSX WIN32 SOLARIS FREEBSD
+bin_SCRIPTS = tkphone
@@ -2228,9 +2228,9 @@
+CLEANFILES = tkphone tkiaxphone
+
+EXTRA_DIST = License tkphone.in tkiaxphone.in
-diff -urNad iaxclient~/simpleclient/wx/Makefile.am iaxclient/simpleclient/wx/Makefile.am
---- iaxclient~/simpleclient/wx/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/wx/Makefile.am 2006-07-29 22:20:35.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/wx/Makefile.am iaxclient-0.0+svn20061014/simpleclient/wx/Makefile.am
+--- iaxclient-0.0+svn20061014~/simpleclient/wx/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/wx/Makefile.am 2006-10-14 09:43:39.000000000 +0200
@@ -0,0 +1,38 @@
+# Should support LINUX MACOSX WIN32
+bin_PROGRAMS = wxiax
Modified: iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch 2007-01-13 13:28:04 UTC (rev 3012)
+++ iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch 2007-01-13 16:45:52 UTC (rev 3013)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad iaxclient~/Makefile.in iaxclient/Makefile.in
---- iaxclient~/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/Makefile.in 2006-07-29 22:23:53.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/Makefile.in iaxclient-0.0+svn20061014/Makefile.in
+--- iaxclient-0.0+svn20061014~/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/Makefile.in 2006-10-14 09:51:51.000000000 +0200
@@ -0,0 +1,679 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -688,9 +688,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient~/aclocal.m4 iaxclient/aclocal.m4
---- iaxclient~/aclocal.m4 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/aclocal.m4 2006-07-29 22:23:41.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/aclocal.m4 iaxclient-0.0+svn20061014/aclocal.m4
+--- iaxclient-0.0+svn20061014~/aclocal.m4 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/aclocal.m4 2006-10-14 09:51:16.000000000 +0200
@@ -0,0 +1,8030 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
@@ -8722,9 +8722,9 @@
+m4_include([macros/iax2.m4])
+m4_include([macros/portaudio.m4])
+m4_include([macros/speex.m4])
-diff -urNad iaxclient~/autogen iaxclient/autogen
---- iaxclient~/autogen 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/autogen 2006-07-29 22:23:25.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/autogen iaxclient-0.0+svn20061014/autogen
+--- iaxclient-0.0+svn20061014~/autogen 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/autogen 2006-10-14 09:51:16.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
@@ -8738,9 +8738,9 @@
+ ./config.status --recheck
+ ./config.status
+fi
-diff -urNad iaxclient~/autogen.sh iaxclient/autogen.sh
---- iaxclient~/autogen.sh 2006-07-29 22:23:25.000000000 +0200
-+++ iaxclient/autogen.sh 2006-07-29 22:23:25.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/autogen.sh iaxclient-0.0+svn20061014/autogen.sh
+--- iaxclient-0.0+svn20061014~/autogen.sh 2006-10-14 09:51:15.000000000 +0200
++++ iaxclient-0.0+svn20061014/autogen.sh 2006-10-14 09:51:16.000000000 +0200
@@ -3,7 +3,7 @@
aclocal -I macros
autoheader
@@ -8750,9 +8750,9 @@
automake -a -c
if test -x ./config.status; then
-diff -urNad iaxclient~/compile iaxclient/compile
---- iaxclient~/compile 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/compile 2006-07-29 22:23:25.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/compile iaxclient-0.0+svn20061014/compile
+--- iaxclient-0.0+svn20061014~/compile 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/compile 2006-10-14 09:51:16.000000000 +0200
@@ -0,0 +1,136 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
@@ -8890,16 +8890,17 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urNad iaxclient~/config.guess iaxclient/config.guess
---- iaxclient~/config.guess 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/config.guess 2006-02-25 16:29:12.000000000 +0100
-@@ -0,0 +1,1497 @@
+diff -urNad iaxclient-0.0+svn20061014~/config.guess iaxclient-0.0+svn20061014/config.guess
+--- iaxclient-0.0+svn20061014~/config.guess 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/config.guess 2006-08-10 17:17:12.000000000 +0200
+@@ -0,0 +1,1500 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++# Inc.
+
-+timestamp='2006-02-23'
++timestamp='2006-07-02'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
@@ -9106,7 +9107,7 @@
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
-+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -9666,6 +9667,8 @@
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ amd64)
++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
@@ -9676,9 +9679,6 @@
+ i*:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
-+ i*:MSYS_NT-*:*:*)
-+ echo ${UNAME_MACHINE}-pc-mingw32
-+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
@@ -9686,10 +9686,10 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
-+ x86:Interix*:[345]*)
++ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
-+ EM64T:Interix*:[345]*)
++ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -9727,6 +9727,9 @@
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
++ avr32*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit ;;
@@ -9885,7 +9888,7 @@
+ LIBC=gnulibc1
+ # endif
+ #else
-+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
@@ -10391,9 +10394,9 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad iaxclient~/config.h.in iaxclient/config.h.in
---- iaxclient~/config.h.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/config.h.in 2006-07-29 22:23:25.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/config.h.in iaxclient-0.0+svn20061014/config.h.in
+--- iaxclient-0.0+svn20061014~/config.h.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/config.h.in 2006-10-14 09:51:16.000000000 +0200
@@ -0,0 +1,128 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
@@ -10523,16 +10526,17 @@
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+ code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile
-diff -urNad iaxclient~/config.sub iaxclient/config.sub
---- iaxclient~/config.sub 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/config.sub 2006-02-25 16:29:12.000000000 +0100
+diff -urNad iaxclient-0.0+svn20061014~/config.sub iaxclient-0.0+svn20061014/config.sub
+--- iaxclient-0.0+svn20061014~/config.sub 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/config.sub 2006-08-10 17:17:12.000000000 +0200
@@ -0,0 +1,1608 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++# Inc.
+
-+timestamp='2006-02-23'
++timestamp='2006-07-02'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
@@ -10769,7 +10773,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
@@ -10777,7 +10781,8 @@
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
-+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
++ | m32c | m32r | m32rle | m68000 | m68k | m88k \
++ | maxq | mb | microblaze | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
@@ -10803,11 +10808,11 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
-+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-+ | sparcv8 | sparcv9 | sparcv9b \
-+ | strongarm \
++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
@@ -10815,9 +10820,6 @@
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
-+ m32c)
-+ basic_machine=$basic_machine-unknown
-+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
@@ -10847,7 +10849,7 @@
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | avr-* \
++ | avr-* | avr32-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
@@ -10858,7 +10860,7 @@
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
-+ | m32r-* | m32rle-* \
++ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -10887,11 +10889,11 @@
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
@@ -10902,8 +10904,6 @@
+ | ymp-* \
+ | z8k-*)
+ ;;
-+ m32c-*)
-+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
@@ -11657,7 +11657,7 @@
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
-+ sparc | sparcv8 | sparcv9 | sparcv9b)
++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ basic_machine=sparc-sun
+ ;;
+ cydra)
@@ -11746,7 +11746,7 @@
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+ | -skyos* | -haiku* | -rdos*)
++ | -skyos* | -haiku* | -rdos* | -toppers*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
@@ -11898,6 +11898,9 @@
+# system, and we'll never get to this point.
+
+case $basic_machine in
++ spu-*)
++ os=-elf
++ ;;
+ *-acorn)
+ os=-riscix1.2
+ ;;
@@ -11907,9 +11910,9 @@
+ arm*-semi)
+ os=-aout
+ ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
++ c4x-* | tic4x-*)
++ os=-coff
++ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
@@ -12135,13 +12138,13 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad iaxclient~/configure iaxclient/configure
---- iaxclient~/configure 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/configure 2006-07-29 22:23:46.000000000 +0200
-@@ -0,0 +1,26596 @@
+diff -urNad iaxclient-0.0+svn20061014~/configure iaxclient-0.0+svn20061014/configure
+--- iaxclient-0.0+svn20061014~/configure 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/configure 2006-10-14 09:51:43.000000000 +0200
+@@ -0,0 +1,26600 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.60 for iaxclient 0.0+svn20060729.
++# Generated by GNU Autoconf 2.60a for iaxclient 0.0+svn20070113.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -12854,44 +12857,44 @@
+# Identity of this package.
+PACKAGE_NAME='iaxclient'
+PACKAGE_TARNAME='iaxclient'
-+PACKAGE_VERSION='0.0+svn20060729'
-+PACKAGE_STRING='iaxclient 0.0+svn20060729'
++PACKAGE_VERSION='0.0+svn20070113'
++PACKAGE_STRING='iaxclient 0.0+svn20070113'
+PACKAGE_BUGREPORT=''
+
+ac_unique_file="lib/iaxclient.h"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
-+#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
-+#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
-+#if STDC_HEADERS
++#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
-+# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+#endif
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#endif
-+#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
-+#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
-+#if HAVE_STDINT_H
++#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
-+#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
@@ -13574,7 +13577,7 @@
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
-+\`configure' configures iaxclient 0.0+svn20060729 to adapt to many kinds of systems.
++\`configure' configures iaxclient 0.0+svn20070113 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
@@ -13644,7 +13647,7 @@
+
+if test -n "$ac_init_help"; then
+ case $ac_init_help in
-+ short | recursive ) echo "Configuration of iaxclient 0.0+svn20060729:";;
++ short | recursive ) echo "Configuration of iaxclient 0.0+svn20070113:";;
+ esac
+ cat <<\_ACEOF
+
@@ -13794,8 +13797,8 @@
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+ cat <<\_ACEOF
-+iaxclient configure 0.0+svn20060729
-+generated by GNU Autoconf 2.60
++iaxclient configure 0.0+svn20070113
++generated by GNU Autoconf 2.60a
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -13808,8 +13811,8 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
-+It was created by iaxclient $as_me 0.0+svn20060729, which was
-+generated by GNU Autoconf 2.60. Invocation command line was
++It was created by iaxclient $as_me 0.0+svn20070113, which was
++generated by GNU Autoconf 2.60a. Invocation command line was
+
+ $ $0 $@
+
@@ -14488,7 +14491,7 @@
+
+# Define the identity of the package.
+ PACKAGE='iaxclient'
-+ VERSION='0.0+svn20060729'
++ VERSION='0.0+svn20070113'
+
+
+cat >>confdefs.h <<_ACEOF
@@ -15313,7 +15316,7 @@
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
-+for ac_file in $ac_files
++for ac_file in $ac_files ''
+do
+ test -f "$ac_file" || continue
+ case $ac_file in
@@ -15341,6 +15344,12 @@
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
++ ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
@@ -15352,8 +15361,6 @@
+fi
+
+ac_exeext=$ac_cv_exeext
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
+
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
@@ -17545,7 +17552,7 @@
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
-+ echo '#line 5407 "configure"' > conftest.$ac_ext
++ echo '#line 5411 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
@@ -17698,7 +17705,7 @@
+ lt_cv_cc_needs_belf=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
@@ -20253,11 +20260,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:8115: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8119: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:8119: \$? = $ac_status" >&5
++ echo "$as_me:8123: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
@@ -20521,11 +20528,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:8383: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8387: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:8387: \$? = $ac_status" >&5
++ echo "$as_me:8391: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
@@ -20625,11 +20632,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:8487: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8491: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:8491: \$? = $ac_status" >&5
++ echo "$as_me:8495: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -21140,7 +21147,7 @@
+
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
@@ -21215,7 +21222,7 @@
+
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
@@ -22480,7 +22487,7 @@
+ ac_cv_lib_dl_dlopen=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
@@ -22591,7 +22598,7 @@
+ ac_cv_func_shl_load=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -22670,7 +22677,7 @@
+ ac_cv_lib_dld_shl_load=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
@@ -22771,7 +22778,7 @@
+ ac_cv_func_dlopen=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -22850,7 +22857,7 @@
+ ac_cv_lib_dl_dlopen=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
@@ -22930,7 +22937,7 @@
+ ac_cv_lib_svld_dlopen=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
@@ -23010,7 +23017,7 @@
+ ac_cv_lib_dld_dld_link=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
@@ -23066,7 +23073,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 10928 "configure"
++#line 10932 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -23166,7 +23173,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 11028 "configure"
++#line 11032 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -24287,7 +24294,7 @@
+
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
@@ -24363,7 +24370,7 @@
+
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
@@ -25534,11 +25541,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:13396: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13400: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:13400: \$? = $ac_status" >&5
++ echo "$as_me:13404: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
@@ -25638,11 +25645,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:13500: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13504: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:13504: \$? = $ac_status" >&5
++ echo "$as_me:13508: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -27199,11 +27206,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:15061: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15065: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:15065: \$? = $ac_status" >&5
++ echo "$as_me:15069: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
@@ -27303,11 +27310,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:15165: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15169: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:15169: \$? = $ac_status" >&5
++ echo "$as_me:15173: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -27808,7 +27815,7 @@
+
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
@@ -27873,7 +27880,7 @@
+
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
@@ -29522,11 +29529,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:17384: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17388: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:17388: \$? = $ac_status" >&5
++ echo "$as_me:17392: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
@@ -29790,11 +29797,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:17652: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17656: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:17656: \$? = $ac_status" >&5
++ echo "$as_me:17660: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
@@ -29894,11 +29901,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:17756: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17760: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:17760: \$? = $ac_status" >&5
++ echo "$as_me:17764: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -30409,7 +30416,7 @@
+
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
@@ -30484,7 +30491,7 @@
+
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
@@ -33386,10 +33393,10 @@
+#ifndef __cplusplus
+ /* Ultrix mips cc rejects this. */
+ typedef int charset[2];
-+ const charset x;
++ const charset cs;
+ /* SunOS 4.1.1 cc rejects this. */
-+ char const *const *ccp;
-+ char **p;
++ char const *const *pcpcc;
++ char **ppc;
+ /* NEC SVR4.0.2 mips cc rejects this. */
+ struct point {int x, y;};
+ static struct point const zero = {0,0};
@@ -33398,11 +33405,11 @@
+ an arm of an if-expression whose if-part is not a constant
+ expression */
+ const char *g = "string";
-+ ccp = &g + (g ? g-g : 0);
++ pcpcc = &g + (g ? g-g : 0);
+ /* HPUX 7.0 cc rejects these. */
-+ ++ccp;
-+ p = (char**) ccp;
-+ ccp = (char const *const *) p;
++ ++pcpcc;
++ ppc = (char**) pcpcc;
++ pcpcc = (char const *const *) ppc;
+ { /* SCO 3.2v4 cc rejects this. */
+ char *t;
+ char const *s = 0 ? (char *) 0 : (char const *) 0;
@@ -33429,7 +33436,7 @@
+ const int foo = 10;
+ if (!foo) return 0;
+ }
-+ return !x[0] && !zero.x;
++ return !cs[0] && !zero.x;
+#endif
+
+ ;
@@ -34080,7 +34087,7 @@
+ eval "$as_ac_var=no"
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
@@ -34356,7 +34363,7 @@
+ ac_cv_lib_gsm_main=no
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
@@ -34640,7 +34647,7 @@
+ echo "*** or that you have moved Speex since it was installed."
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
@@ -34962,7 +34969,7 @@
+ echo "*** may want to edit the iax-config script: $IAX2_CONFIG"
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
@@ -35118,7 +35125,7 @@
+ no_portaudio=yes
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
@@ -35221,7 +35228,7 @@
+ echo "*** or that you have moved Portaudio since it was installed."
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
@@ -36205,7 +36212,7 @@
+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
@@ -36534,7 +36541,7 @@
+ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
@@ -36793,7 +36800,7 @@
+
+fi
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ done
+
@@ -37522,8 +37529,8 @@
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
-+This file was extended by iaxclient $as_me 0.0+svn20060729, which was
-+generated by GNU Autoconf 2.60. Invocation command line was
++This file was extended by iaxclient $as_me 0.0+svn20070113, which was
++generated by GNU Autoconf 2.60a. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
@@ -37552,7 +37559,7 @@
+Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
-+ -V, --version print version number, then exit
++ -V, --version print version number and configuration settings, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
@@ -37575,8 +37582,8 @@
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+ac_cs_version="\\
-+iaxclient config.status 0.0+svn20060729
-+configured by $0, generated by GNU Autoconf 2.60,
++iaxclient config.status 0.0+svn20070113
++configured by $0, generated by GNU Autoconf 2.60a,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2006 Free Software Foundation, Inc.
@@ -38735,9 +38742,9 @@
+
+{ echo "$as_me:$LINENO: Configured clients: $clients" >&5
+echo "$as_me: Configured clients: $clients" >&6;}
-diff -urNad iaxclient~/depcomp iaxclient/depcomp
---- iaxclient~/depcomp 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/depcomp 2006-07-29 22:23:25.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/depcomp iaxclient-0.0+svn20061014/depcomp
+--- iaxclient-0.0+svn20061014~/depcomp 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/depcomp 2006-10-14 09:51:16.000000000 +0200
@@ -0,0 +1,526 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
@@ -39265,9 +39272,9 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urNad iaxclient~/install-sh iaxclient/install-sh
---- iaxclient~/install-sh 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/install-sh 2006-07-29 22:23:25.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/install-sh iaxclient-0.0+svn20061014/install-sh
+--- iaxclient-0.0+svn20061014~/install-sh 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/install-sh 2006-10-14 09:51:16.000000000 +0200
@@ -0,0 +1,325 @@
+#!/bin/sh
+# install - install a program, script, or datafile
@@ -39594,10 +39601,10 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urNad iaxclient~/lib/Makefile.in iaxclient/lib/Makefile.in
---- iaxclient~/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/lib/Makefile.in 2006-07-29 22:23:50.000000000 +0200
-@@ -0,0 +1,1499 @@
+diff -urNad iaxclient-0.0+svn20061014~/lib/Makefile.in iaxclient-0.0+svn20061014/lib/Makefile.in
+--- iaxclient-0.0+svn20061014~/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/lib/Makefile.in 2006-10-14 09:51:49.000000000 +0200
+@@ -0,0 +1,1498 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
@@ -39657,7 +39664,7 @@
+#endif
+ at USE_LOCAL_ILBC_TRUE@am__append_14 = codec_ilbc.c
+ at USE_LOCAL_ILBC_TRUE@am__append_15 = $(SRCS_ILBC)
-+ at JITTERBUF_TRUE@am__append_16 = jitterbuf.c
++ at JITTERBUF_TRUE@am__append_16 = libiax2/src/jitterbuf.c
+subdir = lib
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in TODO
@@ -39701,9 +39708,10 @@
+ gsm/inc/proto.h libiax2/src/md5.c libiax2/src/iax.c \
+ libiax2/src/iax2-parser.c libiax2/src/frame.h \
+ libiax2/src/iax2.h libiax2/src/iax2-parser.h \
-+ libiax2/src/iax-client.h libiax2/src/md5.h libspeex/nb_celp.c \
-+ libspeex/sb_celp.c libspeex/lpc.c libspeex/ltp.c \
-+ libspeex/lsp.c libspeex/quant_lsp.c libspeex/lsp_tables_nb.c \
++ libiax2/src/iax-client.h libiax2/src/md5.h \
++ libiax2/src/jitterbuf.c libspeex/nb_celp.c libspeex/sb_celp.c \
++ libspeex/lpc.c libspeex/ltp.c libspeex/lsp.c \
++ libspeex/quant_lsp.c libspeex/lsp_tables_nb.c \
+ libspeex/gain_table.c libspeex/gain_table_lbr.c \
+ libspeex/cb_search.c libspeex/filters.c libspeex/bits.c \
+ libspeex/modes.c libspeex/speex.c libspeex/vq.c \
@@ -39736,7 +39744,7 @@
+ libspeex/include/speex/speex_preprocess.h \
+ libspeex/include/speex/speex_bits.h \
+ libspeex/include/speex/speex_config_types.h \
-+ libspeex/include/speex/speex_types.h codec_ilbc.c jitterbuf.c \
++ libspeex/include/speex/speex_types.h codec_ilbc.c \
+ portaudio/pablio/ringbuffer.c audio_encode.c audio_portaudio.c \
+ audio_file.c codec_gsm.c codec_ulaw.c codec_speex.c \
+ codec_alaw.c iaxclient_lib.c spandsp/plc.h spandsp/plc.c \
@@ -39761,10 +39769,11 @@
+ gsm/src/long_term.lo gsm/src/lpc.lo gsm/src/preprocess.lo \
+ gsm/src/rpe.lo gsm/src/short_term.lo gsm/src/table.lo
+ at USE_LOCAL_GSM_TRUE@am__objects_10 = $(am__objects_9)
-+am__objects_11 = libiax2/src/md5.lo libiax2/src/iax.lo \
-+ libiax2/src/iax2-parser.lo
-+ at USE_LOCAL_IAX2_TRUE@am__objects_12 = $(am__objects_11)
-+am__objects_13 = libspeex/nb_celp.lo libspeex/sb_celp.lo \
++ at JITTERBUF_TRUE@am__objects_11 = libiax2/src/jitterbuf.lo
++am__objects_12 = libiax2/src/md5.lo libiax2/src/iax.lo \
++ libiax2/src/iax2-parser.lo $(am__objects_11)
++ at USE_LOCAL_IAX2_TRUE@am__objects_13 = $(am__objects_12)
++am__objects_14 = libspeex/nb_celp.lo libspeex/sb_celp.lo \
+ libspeex/lpc.lo libspeex/ltp.lo libspeex/lsp.lo \
+ libspeex/quant_lsp.lo libspeex/lsp_tables_nb.lo \
+ libspeex/gain_table.lo libspeex/gain_table_lbr.lo \
@@ -39779,12 +39788,11 @@
+ libspeex/speex_callbacks.lo libspeex/math_approx.lo \
+ libspeex/stereo.lo libspeex/preprocess.lo libspeex/smallft.lo \
+ libspeex/lbr_48k_tables.lo libspeex/jitter.lo libspeex/mdf.lo
-+ at USE_LOCAL_SPEEX_TRUE@am__objects_14 = $(am__objects_13)
-+ at USE_LOCAL_ILBC_TRUE@am__objects_15 = codec_ilbc.lo
-+ at JITTERBUF_TRUE@am__objects_16 = jitterbuf.lo
++ at USE_LOCAL_SPEEX_TRUE@am__objects_15 = $(am__objects_14)
++ at USE_LOCAL_ILBC_TRUE@am__objects_16 = codec_ilbc.lo
+am__objects_17 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \
-+ $(am__objects_8) $(am__objects_10) $(am__objects_12) \
-+ $(am__objects_14) $(am__objects_15) $(am__objects_16) \
++ $(am__objects_8) $(am__objects_10) $(am__objects_13) \
++ $(am__objects_15) $(am__objects_16) \
+ portaudio/pablio/ringbuffer.lo audio_encode.lo \
+ audio_portaudio.lo audio_file.lo codec_gsm.lo codec_ulaw.lo \
+ codec_speex.lo codec_alaw.lo iaxclient_lib.lo spandsp/plc.lo
@@ -40010,7 +40018,7 @@
+include_HEADERS = iaxclient.h
+SRCS = $(am__append_1) $(am__append_3) $(am__append_7) \
+ $(am__append_10) $(am__append_11) $(am__append_12) \
-+ $(am__append_13) $(am__append_14) $(am__append_16) \
++ $(am__append_13) $(am__append_14) \
+ portaudio/pablio/ringbuffer.c audio_encode.c audio_portaudio.c \
+ audio_file.c codec_gsm.c codec_ulaw.c codec_speex.c \
+ codec_alaw.c iaxclient_lib.c spandsp/plc.h spandsp/plc.c \
@@ -40161,16 +40169,10 @@
+ unixfuncs.c \
+ portmixer/px_mac_core/px_mac_core.c
+
-+SRCS_IAX2 = \
-+ libiax2/src/md5.c \
-+ libiax2/src/iax.c \
-+ libiax2/src/iax2-parser.c \
-+ libiax2/src/frame.h \
-+ libiax2/src/iax2.h \
-+ libiax2/src/iax2-parser.h \
-+ libiax2/src/iax-client.h \
-+ libiax2/src/md5.h
-+
++SRCS_IAX2 = libiax2/src/md5.c libiax2/src/iax.c \
++ libiax2/src/iax2-parser.c libiax2/src/frame.h \
++ libiax2/src/iax2.h libiax2/src/iax2-parser.h \
++ libiax2/src/iax-client.h libiax2/src/md5.h $(am__append_16)
+EXTRA_DIST = sound2c.pl \
+gsm/copyright gsm/readme libiax2/AUTHORS libiax2/ChangeLog \
+libiax2/COPYING libiax2/COPYING.LIB libiax2/NEWS libiax2/README \
@@ -40326,6 +40328,8 @@
+ libiax2/src/$(DEPDIR)/$(am__dirstamp)
+libiax2/src/iax2-parser.lo: libiax2/src/$(am__dirstamp) \
+ libiax2/src/$(DEPDIR)/$(am__dirstamp)
++libiax2/src/jitterbuf.lo: libiax2/src/$(am__dirstamp) \
++ libiax2/src/$(DEPDIR)/$(am__dirstamp)
+libspeex/$(am__dirstamp):
+ @$(mkdir_p) libspeex
+ @: > libspeex/$(am__dirstamp)
@@ -40545,6 +40549,8 @@
+ -rm -f libiax2/src/iax.lo
+ -rm -f libiax2/src/iax2-parser.$(OBJEXT)
+ -rm -f libiax2/src/iax2-parser.lo
++ -rm -f libiax2/src/jitterbuf.$(OBJEXT)
++ -rm -f libiax2/src/jitterbuf.lo
+ -rm -f libiax2/src/md5.$(OBJEXT)
+ -rm -f libiax2/src/md5.lo
+ -rm -f libspeex/bits.$(OBJEXT)
@@ -40642,7 +40648,6 @@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/codec_speex.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/codec_ulaw.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/iaxclient_lib.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/jitterbuf.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unixfuncs.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/winfuncs.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at gsm/src/$(DEPDIR)/add.Plo at am__quote@
@@ -40688,6 +40693,7 @@
+ at AMDEP_TRUE@@am__include@ @am__quote at iLBC/$(DEPDIR)/syntFilter.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at libiax2/src/$(DEPDIR)/iax.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at libiax2/src/$(DEPDIR)/iax2-parser.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at libiax2/src/$(DEPDIR)/jitterbuf.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at libiax2/src/$(DEPDIR)/md5.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at libspeex/$(DEPDIR)/bits.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at libspeex/$(DEPDIR)/cb_search.Plo at am__quote@
@@ -41097,9 +41103,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient~/ltmain.sh iaxclient/ltmain.sh
---- iaxclient~/ltmain.sh 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
+diff -urNad iaxclient-0.0+svn20061014~/ltmain.sh iaxclient-0.0+svn20061014/ltmain.sh
+--- iaxclient-0.0+svn20061014~/ltmain.sh 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
@@ -0,0 +1,6871 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -47972,9 +47978,9 @@
+# mode:shell-script
+# sh-indentation:2
+# End:
-diff -urNad iaxclient~/missing iaxclient/missing
---- iaxclient~/missing 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/missing 2006-07-29 22:23:26.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/missing iaxclient-0.0+svn20061014/missing
+--- iaxclient-0.0+svn20061014~/missing 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/missing 2006-10-14 09:51:16.000000000 +0200
@@ -0,0 +1,360 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
@@ -48336,9 +48342,9 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urNad iaxclient~/simpleclient/Makefile.in iaxclient/simpleclient/Makefile.in
---- iaxclient~/simpleclient/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/Makefile.in 2006-07-29 22:23:51.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/Makefile.in iaxclient-0.0+svn20061014/simpleclient/Makefile.in
+--- iaxclient-0.0+svn20061014~/simpleclient/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/Makefile.in 2006-10-14 09:51:49.000000000 +0200
@@ -0,0 +1,534 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -48874,9 +48880,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient~/simpleclient/WinIAX/Makefile.in iaxclient/simpleclient/WinIAX/Makefile.in
---- iaxclient~/simpleclient/WinIAX/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/WinIAX/Makefile.in 2006-07-29 22:23:51.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/WinIAX/Makefile.in iaxclient-0.0+svn20061014/simpleclient/WinIAX/Makefile.in
+--- iaxclient-0.0+svn20061014~/simpleclient/WinIAX/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/WinIAX/Makefile.in 2006-10-14 09:51:49.000000000 +0200
@@ -0,0 +1,531 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -49409,9 +49415,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient~/simpleclient/iaxcomm/Makefile.in iaxclient/simpleclient/iaxcomm/Makefile.in
---- iaxclient~/simpleclient/iaxcomm/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/iaxcomm/Makefile.in 2006-07-29 22:23:51.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/iaxcomm/Makefile.in iaxclient-0.0+svn20061014/simpleclient/iaxcomm/Makefile.in
+--- iaxclient-0.0+svn20061014~/simpleclient/iaxcomm/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/iaxcomm/Makefile.in 2006-10-14 09:51:50.000000000 +0200
@@ -0,0 +1,663 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -50076,9 +50082,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient~/simpleclient/iaxphone/Makefile.in iaxclient/simpleclient/iaxphone/Makefile.in
---- iaxclient~/simpleclient/iaxphone/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/iaxphone/Makefile.in 2006-07-29 22:23:52.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/iaxphone/Makefile.in iaxclient-0.0+svn20061014/simpleclient/iaxphone/Makefile.in
+--- iaxclient-0.0+svn20061014~/simpleclient/iaxphone/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/iaxphone/Makefile.in 2006-10-14 09:51:50.000000000 +0200
@@ -0,0 +1,573 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -50653,9 +50659,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient~/simpleclient/testcall/Makefile.in iaxclient/simpleclient/testcall/Makefile.in
---- iaxclient~/simpleclient/testcall/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/testcall/Makefile.in 2006-07-29 22:23:52.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/testcall/Makefile.in iaxclient-0.0+svn20061014/simpleclient/testcall/Makefile.in
+--- iaxclient-0.0+svn20061014~/simpleclient/testcall/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/testcall/Makefile.in 2006-10-14 09:51:50.000000000 +0200
@@ -0,0 +1,514 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -51171,9 +51177,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient~/simpleclient/tkphone/Makefile.in iaxclient/simpleclient/tkphone/Makefile.in
---- iaxclient~/simpleclient/tkphone/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/tkphone/Makefile.in 2006-07-29 22:23:52.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/tkphone/Makefile.in iaxclient-0.0+svn20061014/simpleclient/tkphone/Makefile.in
+--- iaxclient-0.0+svn20061014~/simpleclient/tkphone/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/tkphone/Makefile.in 2006-10-14 09:51:50.000000000 +0200
@@ -0,0 +1,610 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -51785,9 +51791,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient~/simpleclient/wx/Makefile.in iaxclient/simpleclient/wx/Makefile.in
---- iaxclient~/simpleclient/wx/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ iaxclient/simpleclient/wx/Makefile.in 2006-07-29 22:23:52.000000000 +0200
+diff -urNad iaxclient-0.0+svn20061014~/simpleclient/wx/Makefile.in iaxclient-0.0+svn20061014/simpleclient/wx/Makefile.in
+--- iaxclient-0.0+svn20061014~/simpleclient/wx/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20061014/simpleclient/wx/Makefile.in 2006-10-14 09:51:51.000000000 +0200
@@ -0,0 +1,539 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
Deleted: iaxclient/trunk/debian/patches/170_deadlock.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/170_deadlock.dpatch 2007-01-13 13:28:04 UTC (rev 3012)
+++ iaxclient/trunk/debian/patches/170_deadlock.dpatch 2007-01-13 16:45:52 UTC (rev 3013)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 170_deadlock.dpatch by <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Resolve deadlock in iaxc_stop_processing_thread by unlocking gui mutex.
-
- at DPATCH@
-diff -urNad iaxclient-0.0+cvs20060227~/simpleclient/iaxcomm/frame.cc iaxclient-0.0+cvs20060227/simpleclient/iaxcomm/frame.cc
---- iaxclient-0.0+cvs20060227~/simpleclient/iaxcomm/frame.cc 2006-02-27 20:57:50.000000000 +0100
-+++ iaxclient-0.0+cvs20060227/simpleclient/iaxcomm/frame.cc 2006-02-27 20:59:56.000000000 +0100
-@@ -373,15 +373,16 @@
- delete wxGetApp().theTaskBarIcon;
- #endif
-
--#if 0
- // Getting rid of this block seems to be harmless, and also seems to get rid of the
- // frequent hang when exiting on linux.
- iaxc_dump_all_calls();
- for(int i=0;i<10;i++) {
- iaxc_millisleep(100);
- }
-+
-+ wxMutexGuiLeave();
- iaxc_stop_processing_thread();
--#endif
-+ wxMutexGuiEnter();
-
- if(help != NULL)
- help->Quit();
Deleted: iaxclient/trunk/debian/patches/230_unicode.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/230_unicode.dpatch 2007-01-13 13:28:04 UTC (rev 3012)
+++ iaxclient/trunk/debian/patches/230_unicode.dpatch 2007-01-13 16:45:52 UTC (rev 3013)
@@ -1,448 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 230_unicode.dpatch by <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Unicode related bugfixes. Printf %s formats requires wxChar*
-
- at DPATCH@
-diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/accounts.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/accounts.cc
---- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/accounts.cc 2006-05-18 20:56:46.000000000 +0200
-+++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/accounts.cc 2006-05-18 20:56:47.000000000 +0200
-@@ -180,9 +180,6 @@
-
- void AddAccountDialog::OnAdd(wxCommandEvent &event)
- {
--#if defined(__UNICODE__)
-- wxMBConvUTF8 utf8;
--#endif
- wxConfig *config = theApp::getConfig();
-
- if(!Password->GetValue().IsSameAs(Confirm->GetValue())) {
-@@ -205,17 +202,12 @@
- // Thanks, AJ
- char user[256], pass[256], host[256];
-
--#if defined(__UNICODE__)
-- utf8.WC2MB(user, UserName->GetValue().c_str(), 256);
-- utf8.WC2MB(pass, Password->GetValue().c_str(), 256);
-- utf8.WC2MB(host, HostName->GetValue().c_str(), 256);
--#else
-- wxStrcpy(user, UserName->GetValue());
-- wxStrcpy(pass, Password->GetValue());
-- wxStrcpy(host, HostName->GetValue());
--#endif
-+ strncpy(user, UserName->GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(user));
-+ strncpy(pass, Password->GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(pass));
-+ strncpy(host, HostName->GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(host));
- iaxc_register(user, pass, host);
-
-+
- AccountName->SetValue(_T(""));
- HostName->SetValue(_T(""));
- UserName->SetValue(_T(""));
-diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/calls.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/calls.cc
---- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/calls.cc 2006-05-18 20:27:47.000000000 +0200
-+++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/calls.cc 2006-05-18 20:56:47.000000000 +0200
-@@ -145,9 +145,6 @@
- int selected = event.m_itemIndex;
- char ext[256];
- wxString Title;
--#if defined(__UNICODE__)
-- wxMBConvUTF8 utf8;
--#endif
-
- Title.Printf(_T("Transfer Call %d"), selected);
- wxTextEntryDialog dialog(this,
-@@ -158,11 +155,7 @@
-
- if(dialog.ShowModal() != wxID_CANCEL) {
-
--#if defined(__UNICODE__)
-- utf8.WC2MB(ext, dialog.GetValue().c_str(), 256);
--#else
-- strncpy(ext, dialog.GetValue().c_str(), 256);
--#endif
-+ strncpy(ext, dialog.GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(ext));
-
- iaxc_blind_transfer_call(selected, ext);
- }
-@@ -193,10 +186,7 @@
- long dummy;
- bool bCont;
- static int selectedcall = -1;
--#if defined(__UNICODE__)
-- wchar_t ws[256];
-- wxMBConvUTF8 utf8;
--#endif
-+ wxString ws;
-
- if(c.state & IAXC_CALL_STATE_RINGING) {
- wxGetApp().theFrame->Show();
-@@ -227,18 +217,18 @@
- wxString Remote;
-
-
-- RemoteName.Printf(_T("%s"), c.remote_name);
-+ RemoteName = wxString(c.remote_name, *(wxGetApp().ConvIax));
- Info = RemoteName.AfterLast('@'); // Hide username:password
- Info = Info.BeforeFirst('/'); // Remove extension in outbound call
- // (it will be duplicated in <>)
-
-- Remote.Printf(_T("%s"), c.remote);
-+ Remote = wxString(c.remote, *(wxGetApp().ConvIax));
- if(!Remote.IsEmpty()) // Additional info in Remote
- Info += _T(" <") + Remote + _T(">");
-
- Codec = GetCodec(c); // Negotiated codec
- if(!Codec.IsEmpty())
-- Info += _T(" [") + GetCodec(c) + _T("]"); // Indicate Negotiated codec
-+ Info += _T(" [") + GetCodec(c) + _T("]"); // Indicate Negotiated codec
-
- SetItem(c.callNo, 2, Info );
-
-@@ -274,8 +264,7 @@
- // Look for the caller in our phonebook
- config->SetPath(_T("/PhoneBook"));
- bCont = config->GetFirstGroup(str, dummy);
--#if defined(__UNICODE__)
-- utf8.MB2WC(ws, c.remote_name, 256);
-+ ws = wxString(c.remote_name, *(wxGetApp().ConvIax));
- while ( bCont ) {
- if(str.IsSameAs(ws))
- break;
-@@ -283,31 +272,17 @@
- }
-
- if(!str.IsSameAs(ws)) {
--#else
-- while ( bCont ) {
-- if(str.IsSameAs(c.remote_name))
-- break;
-- bCont = config->GetNextGroup(str, dummy);
-- }
--
-- if(!str.IsSameAs(c.remote_name)) {
--#endif
- // Add to phone book if not there already
-- str.Printf(_T("%s/Extension"), c.remote_name);
-+ str.Printf(_T("%s/Extension"), wxString(c.remote_name, *(wxGetApp().ConvIax)).c_str());
- config->Write(str, c.remote);
- } else {
- // Since they're in the phone book, look for ringtone
-- str.Printf(_T("%s/RingTone"), c.remote_name);
-+ str.Printf(_T("%s/RingTone"), wxString(c.remote_name, *(wxGetApp().ConvIax)).c_str());
- wxGetApp().CallerIDRingName = config->Read(str, _T(""));
- }
-
- if(strcmp(c.local_context, "intercom") == 0) {
--#if defined(__UNICODE__)
-- utf8.MB2WC(ws, c.local, 256);
-- if(config->Read(_T("/Prefs/IntercomPass"), _T("s")).IsSameAs(ws)) {
--#else
-- if(config->Read(_T("/Prefs/IntercomPass"), _T("s")).IsSameAs(c.local)) {
--#endif
-+ if(config->Read(_T("/Prefs/IntercomPass"), _T("s")).IsSameAs(wxString(c.local, *(wxGetApp().ConvIax)))) {
- wxGetApp().IntercomTone.Start(1);
- iaxc_millisleep(1000);
- iaxc_unquelch(c.callNo);
-diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/devices.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/devices.cc
---- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/devices.cc 2006-05-18 20:56:46.000000000 +0200
-+++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/devices.cc 2006-05-18 20:56:47.000000000 +0200
-@@ -101,21 +101,12 @@
- int i;
- long caps;
- wxString devname;
--#if defined(__UNICODE__)
-- wchar_t wdevname[256];
-- wxMBConvUTF8 utf8;
--#endif
-
- iaxc_audio_devices_get(&devices, &nDevs, &input, &output, &ring);
-
- for(i=0; i<nDevs; i++) {
- caps = devices->capabilities;
--#if defined(__UNICODE__)
-- utf8.MB2WC(wdevname, devices->name, 256);
-- devname = wdevname;
--#else
-- devname = devices->name;
--#endif
-+ devname = wxString(devices->name, wxConvUTF8);
-
- if(caps & IAXC_AD_INPUT) {
- InputDevice->Append(devname);
-@@ -216,10 +207,6 @@
- int input = 0;
- int output = 0;
- int ring = 0;
--#if defined(__UNICODE__)
-- wchar_t wdevname[256];
-- wxMBConvUTF8 utf8;
--#endif
-
- // Note that if we're called with an invalid devicename, the deviceID
- // stays 0, which equals default.
-@@ -228,32 +215,17 @@
-
- for(i=0; i<nDevs; i++) {
- if(devices->capabilities & IAXC_AD_INPUT) {
--#if defined(__UNICODE__)
-- utf8.MB2WC(wdevname, devices->name, 256);
-- if(inname.Cmp(wdevname) == 0)
--#else
-- if(inname.Cmp(devices->name) == 0)
--#endif
-+ if(inname.Cmp(wxString(devices->name, wxConvUTF8)) == 0)
- input = devices->devID;
- }
-
- if(devices->capabilities & IAXC_AD_OUTPUT) {
--#if defined(__UNICODE__)
-- utf8.MB2WC(wdevname, devices->name, 256);
-- if(outname.Cmp(wdevname) == 0)
--#else
-- if(outname.Cmp(devices->name) == 0)
--#endif
-+ if(outname.Cmp(wxString(devices->name, wxConvUTF8)) == 0)
- output = devices->devID;
- }
-
- if(devices->capabilities & IAXC_AD_RING) {
--#if defined(__UNICODE__)
-- utf8.MB2WC(wdevname, devices->name, 256);
-- if(ringname.Cmp(wdevname) == 0)
--#else
-- if(ringname.Cmp(devices->name) == 0)
--#endif
-+ if(ringname.Cmp(wxString(devices->name, wxConvUTF8)) == 0)
- ring = devices->devID;
- }
- devices++;
-diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/dial.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/dial.cc
---- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/dial.cc 2006-05-18 20:27:47.000000000 +0200
-+++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/dial.cc 2006-05-18 20:56:47.000000000 +0200
-@@ -76,10 +76,6 @@
- {
- wxConfig *config = theApp::getConfig();
- wxString FQIN;
--#if defined(__UNICODE__)
-- wxMBConvUTF8 utf8;
-- char to[256];
--#endif
-
- wxString AccountInfo = DialStr.BeforeLast('/'); // Empty if no '/'
- wxString Extension = DialStr.AfterLast('/'); // dialstr if no '/'
-@@ -117,11 +113,6 @@
- Host.c_str(),
- Extension.c_str());
-
--#if defined(__UNICODE__)
-- utf8.WC2MB(to, FQIN.c_str(), 256);
-- iaxc_call(to);
--#else
-- iaxc_call((char *) FQIN.c_str());
--#endif
-+ iaxc_call((char *)(const char *)FQIN.mb_str(*(wxGetApp().ConvIax)));
- }
-
-diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/frame.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/frame.cc
---- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/frame.cc 2006-05-18 20:56:46.000000000 +0200
-+++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/frame.cc 2006-05-18 20:56:47.000000000 +0200
-@@ -250,7 +250,7 @@
- #endif
-
- #ifdef DATADIR
-- filename = wxFileName(wxString(DATADIR) + wxFILE_SEP_PATH +
-+ filename = wxFileName(wxString(DATADIR, wxConvUTF8) + wxFILE_SEP_PATH +
- _T("iaxcomm.htb"));
-
- if (filename.FileExists()) {
-@@ -622,18 +622,8 @@
-
- int MyFrame::HandleStatusEvent(char *msg)
- {
--#if defined(__UNICODE__)
-- wchar_t ws[256];
-- wxMBConvUTF8 utf8;
--#endif
--
- MessageTicks = 0;
--#if defined(__UNICODE__)
-- utf8.MB2WC(ws, msg, 256);
-- wxGetApp().theFrame->SetStatusText(ws);
--#else
-- wxGetApp().theFrame->SetStatusText(msg);
--#endif
-+ wxGetApp().theFrame->SetStatusText(wxString(msg, *(wxGetApp().ConvIax)));
- return 1;
- }
-
-@@ -695,7 +685,7 @@
- char* libver = (char *)malloc(256);
-
- libver = iaxc_version(libver);
-- msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"), VERSION, libver);
-+ msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"), wxString(VERSION, wxConvUTF8).c_str(), wxString(libver, wxConvUTF8).c_str());
- wxMessageBox(msg, _("iaxComm"), wxOK | wxICON_INFORMATION, this);
- }
-
-@@ -756,23 +746,19 @@
- void MyFrame::OnKeyPad(wxCommandEvent &event)
- {
- wxString Message;
--#if defined(__UNICODE__)
-- wchar_t digit;
--#else
-- char digit;
--#endif
-+ wxChar digit;
- int OTNo;
-
- OTNo = event.GetId() - XRCID("KP0");
-- digit = '0' + (char) OTNo;
-+ digit = wxT('0') + OTNo;
-
- if(OTNo == 10)
-- digit = '*';
-+ digit = wxT('*');
-
- if(OTNo == 11)
-- digit = '#';
-+ digit = wxT('#');
-
-- iaxc_send_dtmf(digit);
-+ iaxc_send_dtmf((char)digit);
-
- wxString SM;
- SM.Printf(_T("DTMF %c"), digit);
-@@ -803,9 +789,6 @@
- int selected = iaxc_selected_call();
- char ext[256];
- wxString Title;
--#if defined(__UNICODE__)
-- wxMBConvUTF8 utf8;
--#endif
-
- Title.Printf(_T("Transfer Call %d"), selected);
- wxTextEntryDialog dialog(this,
-@@ -816,11 +799,7 @@
-
- if(dialog.ShowModal() != wxID_CANCEL) {
-
--#if defined(__UNICODE__)
-- utf8.WC2MB(ext, dialog.GetValue().c_str(), 256);
--#else
-- strncpy(ext, dialog.GetValue().c_str(), 256);
--#endif
-+ strncpy(ext, dialog.GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(ext));
-
- iaxc_blind_transfer_call(selected, ext);
- }
-diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.cc
---- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.cc 2006-05-18 20:56:46.000000000 +0200
-+++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.cc 2006-05-18 20:56:47.000000000 +0200
-@@ -96,6 +96,8 @@
- long dummy;
- bool bCont;
-
-+ ConvIax = &wxConvISO8859_1; /* Caller ID in IAX may be ISO-8859-1 encoded */
-+
- #ifndef __WXMAC__
- // XXX this seems broken on mac with wx-2.4.2
- m_single_instance_checker = new wxSingleInstanceChecker(_T("iaxcomm.lock"));
-@@ -245,9 +247,6 @@
- wxConfig *config = theApp::getConfig();
- wxChar KeyPath[256];
- wxListItem item;
--#if defined(__UNICODE__)
-- wxMBConvUTF8 utf8;
--#endif
-
- wxStringTokenizer tok(RegName, _T(":@"));
- char user[256], pass[256], host[256];
-@@ -256,16 +255,9 @@
- return;
-
- if(tok.CountTokens() == 3) {
--
--#if defined(__UNICODE__)
-- utf8.WC2MB(user, tok.GetNextToken().c_str(), 256);
-- utf8.WC2MB(pass, tok.GetNextToken().c_str(), 256);
-- utf8.WC2MB(host, tok.GetNextToken().c_str(), 256);
--#else
-- strncpy(user, tok.GetNextToken().c_str(), 256);
-- strncpy(pass, tok.GetNextToken().c_str(), 256);
-- strncpy(host, tok.GetNextToken().c_str(), 256);
--#endif
-+ strncpy(user, tok.GetNextToken().mb_str(*ConvIax), sizeof(user));
-+ strncpy(pass, tok.GetNextToken().mb_str(*ConvIax), sizeof(pass));
-+ strncpy(host, tok.GetNextToken().mb_str(*ConvIax), sizeof(host));
- } else {
- // Check if it's a Speed Dial
- wxStrcpy(KeyPath, _T("/Accounts/"));
-@@ -275,15 +267,9 @@
- theFrame->SetStatusText(_T("Register format error"));
- return;
- }
--#if defined(__UNICODE__)
-- utf8.WC2MB(user, config->Read(_T("Username"), _T("")).c_str(), 256);
-- utf8.WC2MB(pass, config->Read(_T("Password"), _T("")).c_str(), 256);
-- utf8.WC2MB(host, config->Read(_T("Host"), _T("")).c_str(), 256);
--#else
-- wxStrcpy(user, config->Read(_T("Username"), _T("")));
-- wxStrcpy(pass, config->Read(_T("Password"), _T("")));
-- wxStrcpy(host, config->Read(_T("Host"), _T("")));
--#endif
-+ strncpy(user, config->Read(_T("Username"), _T("")).mb_str(*ConvIax), sizeof(user));
-+ strncpy(pass, config->Read(_T("Password"), _T("")).mb_str(*ConvIax), sizeof(pass));;
-+ strncpy(host, config->Read(_T("Host"), _T("")).mb_str(*ConvIax), sizeof(host));
- }
- iaxc_register(user, pass, host);
- }
-diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.h iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.h
---- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.h 2006-03-06 16:26:22.000000000 +0100
-+++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.h 2006-05-18 20:56:47.000000000 +0200
-@@ -96,6 +96,8 @@
- wxString Number;
- wxString DefaultAccount;
-
-+ wxMBConv *ConvIax;
-+
- static wxConfig *getConfig();
-
- #ifdef __WXMSW__
-diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/prefs.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/prefs.cc
---- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/prefs.cc 2006-05-18 20:56:46.000000000 +0200
-+++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/prefs.cc 2006-05-18 20:56:47.000000000 +0200
-@@ -125,9 +125,7 @@
- bool bCont;
- wxString str;
-
-- if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Prefs")) ) {
-- wxLogFatalError(_("Can't load Prefs dialog"));
-- }
-+ wxXmlResource::Get()->LoadDialog(this, parent, wxT("Prefs"));
-
- // Reach in for our controls
-
-@@ -336,18 +334,8 @@
-
- void SetCallerID(wxString name, wxString number)
- {
--#if defined(__UNICODE__)
-- wxMBConvUTF8 utf8;
-- char name8[256];
-- char number8[256];
--
-- utf8.WC2MB(name8, name.c_str(), 256);
-- utf8.WC2MB(number8, number.c_str(), 256);
-- iaxc_set_callerid(name8, number8);
--#else
-- iaxc_set_callerid((char *) name.c_str(),
-- (char *) number.c_str());
--#endif
-+ iaxc_set_callerid((char *)(const char *) name.mb_str(*(wxGetApp().ConvIax)),
-+ (char *)(const char *) number.mb_str(*(wxGetApp().ConvIax)));
- }
-
- void PrefsDialog::OnSaveAudio(wxCommandEvent &event)
Deleted: iaxclient/trunk/debian/patches/260_timer.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/260_timer.dpatch 2007-01-13 13:28:04 UTC (rev 3012)
+++ iaxclient/trunk/debian/patches/260_timer.dpatch 2007-01-13 16:45:52 UTC (rev 3013)
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 260_timer.dpatch by <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix segfault during startup, caused by timeout running before
-## DP: the frame is fully initialized.
-
- at DPATCH@
-diff -urNad iaxclient-0.0+svn20060518.debian~/simpleclient/iaxcomm/frame.cc iaxclient-0.0+svn20060518.debian/simpleclient/iaxcomm/frame.cc
---- iaxclient-0.0+svn20060518.debian~/simpleclient/iaxcomm/frame.cc 2006-05-20 00:02:01.000000000 +0200
-+++ iaxclient-0.0+svn20060518.debian/simpleclient/iaxcomm/frame.cc 2006-05-19 23:58:03.000000000 +0200
-@@ -133,6 +133,8 @@
- wxString Name;
- MyTimer *timer;
-
-+ MessageTicks = 0;
-+
- // Load up this frame from XRC. [Note, instead of making a class's
- // constructor take a wxWindow* parent with a default value of NULL,
- // we could have just had designed MyFrame class with an empty
-@@ -231,9 +233,6 @@
- keyStateWindow = gdk_window_new(NULL, &attr, 0);
- #endif
-
-- timer = new MyTimer();
-- timer->Start(100);
--
- RePanel(Name);
-
- wxImage::AddHandler(new wxPNGHandler);
-@@ -258,6 +257,9 @@
- return;
- }
- #endif /* DATADIR */
-+
-+ timer = new MyTimer();
-+ timer->Start(100);
- }
-
- void MyFrame::RePanel(wxString Name)
Modified: iaxclient/trunk/debian/patches/90_mixer.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/90_mixer.dpatch 2007-01-13 13:28:04 UTC (rev 3012)
+++ iaxclient/trunk/debian/patches/90_mixer.dpatch 2007-01-13 16:45:52 UTC (rev 3013)
@@ -35,7 +35,7 @@
much more gracefully */
Px_SetMicrophoneBoost( iMixer, 0 ) ;
-+ if (IAXC_FILTER_AAGC) {
++ if (0) {
/* if the input level is very low, raise it up a bit. Otherwise, AGC cannot detect speech,
and cannot adjust levels */
level = pa_input_level_get(d);
Deleted: iaxclient/trunk/debian/patches/ringbuffer_prefix.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/ringbuffer_prefix.dpatch 2007-01-13 13:28:04 UTC (rev 3012)
+++ iaxclient/trunk/debian/patches/ringbuffer_prefix.dpatch 2007-01-13 16:45:52 UTC (rev 3013)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ringbuffer_prefix.dpatch by <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Avoid duplicated symbols by addning _iaxc_ prefix
-## DP: to ringbuffer functions compiled into iaxclient.
-
- at DPATCH@
-diff -urNad iaxclient~/lib/portaudio/pablio/ringbuffer.h iaxclient/lib/portaudio/pablio/ringbuffer.h
---- iaxclient~/lib/portaudio/pablio/ringbuffer.h 2006-07-25 00:36:09.000000000 +0200
-+++ iaxclient/lib/portaudio/pablio/ringbuffer.h 2006-07-29 20:25:29.000000000 +0200
-@@ -46,6 +46,19 @@
- #include "ringbuffer.h"
- #include <string.h>
-
-+#ifdef USE_IAXC_RINGBUFFER_PREFIX
-+#define RingBuffer_Init _iaxc_RingBuffer_Init
-+#define RingBuffer_Flush _iaxc_RingBuffer_Flush
-+#define RingBuffer_GetWriteAvailable _iaxc_RingBuffer_GetWriteAvailable
-+#define RingBuffer_GetReadAvailable _iaxc_RingBuffer_GetReadAvailable
-+#define RingBuffer_Write _iaxc_RingBuffer_Write
-+#define RingBuffer_Read _iaxc_RingBuffer_Read
-+#define RingBuffer_GetWriteRegions _iaxc_RingBuffer_GetWriteRegions
-+#define RingBuffer_AdvanceWriteIndex _iaxc_RingBuffer_AdvanceWriteIndex
-+#define RingBuffer_GetReadRegions _iaxc_RingBuffer_GetReadRegions
-+#define RingBuffer_AdvanceReadIndex _iaxc_RingBuffer_AdvanceReadIndex
-+#endif
-+
- typedef struct
- {
- long bufferSize; /* Number of bytes in FIFO. Power of 2. Set by RingBuffer_Init. */
More information about the Pkg-voip-commits
mailing list