Merge branch 'master' of...

Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone

sflphone-client-gnome/VERSION

-0.9.6
+0.9.7~beta

sflphone-common/Makefile.am

@@ -26,6 +26,6 @@ indent:
 
 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libs src ringtones man $(TESTS_DIR)
+SUBDIRS = libs src ringtones man #$(TESTS_DIR)
 EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
 

sflphone-common/VERSION

-0.9.6
+0.9.7~beta

sflphone-common/configure.ac

@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
 dnl
 	dnl Process this file with autoconf to produce a configure script.
 	AC_PREREQ(2.59)
-	AC_INIT([SFLphone],[0.9.6~rc1],[sflphoneteam@savoirfairelinux.com],[sflphone])
+	AC_INIT([SFLphone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
 	AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
 AC_REVISION([$Revision$])
 

sflphone-common/test/Makefile.am

@@ -6,20 +6,20 @@ OBJECT_FILES= \
 	../src/sflphoned-managerimpl.o \
 	../src/sflphoned-accountcreator.o \
 	../src/sflphoned-call.o \
-	../src/sflphoned-sipcall.o \
-	../src/sflphoned-iaxcall.o \
+	../src/sip/sipcall.o \
+	../src/iax/libiaxlink_la-iaxcall.o \
 	../src/sflphoned-voiplink.o \
-	../src/sflphoned-sipvoiplink.o \
-	../src/sflphoned-iaxvoiplink.o \
+	../src/sip/sipvoiplink.o \
+	../src/iax/libiaxlink_la-iaxvoiplink.o \
 	../src/sflphoned-account.o \
-	../src/sflphoned-sipaccount.o \
-	../src/sflphoned-iaxaccount.o \
+	../src/sip/sipaccount.o \
+	../src/iax/libiaxlink_la-iaxaccount.o \
 	../src/sflphoned-eventthread.o \
 	../src/plug-in/pluginmanager.o \
 	../src/plug-in/audiorecorder/audiorecord.o \
-	../src/sflphoned-samplerateconverter.o \
-	../src/sflphoned-sdp.o \
-	../src/sflphoned-sdpmedia.o \
+	../src/audio/samplerateconverter.o \
+	../src/sip/sdp.o \
+	../src/sip/sdpmedia.o \
 	../src/sflphoned-numbercleaner.o \
     ../src/history/historymanager.o
 
@@ -38,6 +38,8 @@ numbercleanerTester_LDADD = \
 		@CCGNU2_LIBS@ \
 		@CCRTP_LIBS@ \
 		@SAMPLERATE_LIBS@ \
+		@ZRTPCPP_LIBS@ \
+		@libssl_LIBS@ \
 		$(PJSIP_LIBS) \
 		-luuid \
 		$(OBJECT_FILES)