Part of the patch from Julien

COPYING

@@ -1,12 +1,8 @@
-All of the code (except when other copyright is specified) is 
-(c) 2004-2005 Savoir-faire Linux inc.
-and released under the terms of the venerable
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -114,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -282,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -309,15 +305,15 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -342,4 +338,3 @@ proprietary programs.  If your program is a subroutine library, you may
 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.
-

ChangeLog

@@ -1,85 +1,177 @@
-Jean-Philippe Barette-LaPierre (30 April 2005) version 0.4.1-pre1
-- Changed the order of initialization of modules, in order to
-  removed a race condition.
-- We can build in different build directories.
-  (thanks to Mikael Magnusson)
-- We actualy check if portaudio and eXosip2 libs
-  are installed. (thanks to Mikael Magnusson)
-- zeroconf integration start
-
-Jean-Philippe Barette-LaPierre (30 April 2005) version 0.4.1-pre1
-- Now, we send a final response to reINVITEs
-  (thanks to Mikael Magnusson)
-
-Jean-Philippe Barette-LaPierre (29 April 2005) version 0.4.1-pre1
-- Bug fix when trying to use more than 6 lines.
-
-Jean-Philippe Barette-LaPierre (20 August 2005) version 0.4.1-pre1
-- Manager has now a LifetimeLibrary policy.
-- Utilspp has been rearranged.
-
-Laurielle LEA (10 August 2005) version 0.4
-- Add blink notification for voice-message
-- Cleanup code
-
-Laurielle LEA (1st August 2005) version 0.4
-- Add comments in header files
-
-Laurielle LEA (29 July 2005) version 0.4
-- Add scrolling message
-
-Laurielle LEA (27 July 2005) version 0.4
-- Migrate from libeXoSIP 0.9.0 to libeXosip2-1.9.1-pre15 
-  (http://www.antisip.com/download/)
-
-Laurielle LEA (21 July 2005) version 0.4
-- Change README.
-
-Laurielle LEA (20 July 2005) version 0.4
-- Fix mute feature.
-- Fix many bugs about line management.
-- Add "Compose" item in trayicon menu.
-
-Jean-Philippe Barette-LaPierre (18 July 2005) version 0.4
-- Bug fix if error was raised before setGUI.
-
-Laurielle LEA (18 July 2005) version 0.4
-- Fix incoming call sound notification.
-- Fix transfer if no busy line.
-
-Laurielle LEA (15 July 2005) version 0.4
-- Fix configuration init.
-
-Jerome OUFELLA (13 July 2005) version 0.4
-- Fix tone.
-
-Jean-Philippe Barette-LaPierre (13 July 2005) version 0.4
-- Change "Manager" to a singleton.
-
-Laurielle LEA (13 July 2005) version 0.4
-- Fix bug if network is not available.
-- Fix apply skin feature.
-
-Laurielle LEA (11 July 2005) version 0.4
-- Check functions return.
-- Remove unused mute functions.
-
-Laurielle LEA (8 July 2005) version 0.4
-- Stop program when error opening skin file.
-- Divide toggle() of qtguimainwindow.cpp in small functions.
-- Add return test.
-
-Laurielle LEA (7 July 2005) version 0.4
-- Cleanup audiortp.cpp.
-- Replace #define by global variable in codecDescriptor.cpp.
-- Set mutex of ringbuffer in the functions of RingBuffer object.
-- Divide run() of audiortp.cpp in 3 small functions.
-- Changed device static function in Manager for configurationpanel.ui.h.
-- Updated README.
-
-Jean-Philippe Barrette-LaPierre (6 July 2005) version 0.4
-- Fixed all autotools problems.
-- Updated all autotools scripts to use PortAudioCpp.
-
-Jean-Philippe Barrette-LaPierre (9 June 2005) version 0.4
-- Added the autotools support.
+2006-05-21  Julien Plissonneau Duquene
+
+	* Removed checks for osip from configure.ac (this is needed and
+	checked by eXosip anyway), fixed the check for libs in exosip.m4
+
+	* Fixed Makefiles and autoqt for building on Debian sarge
+
+2006-05-20  Julien Plissonneau Duquene
+
+	* Fixed autotools setup, replaced kde m4 files by autoqt,
+	added tools/autotoolize.sh and tools/bleach.sh
+
+	* Cleaned up the mess in the top directory, merged some files,
+	rewrote the ChangeLog using GNU format, updated the README
+
+	* Removed eXosip2 headers
+
+2005-11-26  The SFLPhone Team
+
+	* Version 0.6.1
+
+2005-11-21  The SFLPhone Team
+
+	* Version 0.6
+
+2005-11-11  The SFLPhone Team
+
+	* Version 0.6 RC3
+
+2005-10-17  The SFLPhone Team
+
+	* Version 0.5
+
+2005-08-30  Jean-Philippe Barette-LaPierre
+
+	* Changed the order of initialization of modules, in order to
+	remove a race condition.
+
+	* We can build in different build directories.
+	(thanks to Mikael Magnusson)
+
+	* We actualy check if portaudio and eXosip2 libs
+	are installed. (thanks to Mikael Magnusson)
+
+	* zeroconf integration start
+
+2005-08-30  Jean-Philippe Barette-LaPierre
+
+	* Now, we send a final response to reINVITEs
+	(thanks to Mikael Magnusson)
+
+2005-08-29  Jean-Philippe Barette-LaPierre
+
+	* Bug fix when trying to use more than 6 lines.
+
+2005-08-20  Jean-Philippe Barette-LaPierre
+
+	* Manager has now a LifetimeLibrary policy.
+
+	* Utilspp has been rearranged.
+
+2005-08-11  The SFLPhone Team
+
+	* Version 0.4.1-pre1
+
+2005-08-10  Laurielle Lea
+
+	* Add blink notification for voice-message
+
+	* Cleanup code
+
+2005-08-01  Laurielle Lea
+
+	* Add comments in header files
+
+2005-07-29  Laurielle Lea
+
+	* Add scrolling message
+
+2005-07-25  Laurielle Lea
+
+	* Migrate from libeXoSIP 0.9.0 to libeXosip2-1.9.1-pre15 
+	(http://www.antisip.com/download/)
+
+2005-07-21  Laurielle Lea
+
+	* Change README.
+
+2005-07-20  Laurielle Lea
+
+	* Fix mute feature.
+
+	* Fix many bugs about line management.
+
+	* Add "Compose" item in trayicon menu.
+
+2005-07-18  Jean-Philippe Barette-LaPierre
+
+	* Bug fix if error was raised before setGUI.
+
+2005-07-18  Laurielle Lea
+
+	* Fix incoming call sound notification.
+
+	* Fix transfer if no busy line.
+
+2005-07-15  Laurielle Lea
+
+	* Fix configuration init.
+
+2005-07-13  Jerome Oufella
+
+	* Fix tone.
+
+2005-07-13  Jean-Philippe Barette-LaPierre
+
+	* Change "Manager" to a singleton.
+
+2005-07-13  Laurielle Lea
+
+	* Fix bug if network is not available.
+
+	* Fix apply skin feature.
+
+2005-07-11  Laurielle Lea
+
+	* Check functions return.
+
+	* Remove unused mute functions.
+
+2005-07-08  The SFLPhone Team
+
+	* Version 0.4
+
+2005-07-08  Laurielle Lea
+
+	* Stop program when error opening skin file.
+
+	* Divide toggle() of qtguimainwindow.cpp in small functions.
+
+	* Add return test.
+
+2005-07-07  Laurielle Lea
+
+	* Cleanup audiortp.cpp.
+
+	* Replace #define by global variable in codecDescriptor.cpp.
+
+	* Set mutex of ringbuffer in the functions of RingBuffer object.
+
+	* Divide run() of audiortp.cpp in 3 small functions.
+
+	* Changed device static function in Manager for configurationpanel.ui.h.
+
+	* Updated README.
+
+2005-07-06  Jean-Philippe Barrette-LaPierre
+
+	* Fixed all autotools problems.
+
+	* Updated all autotools scripts to use PortAudioCpp.
+
+2005-06-09  Jean-Philippe Barrette-LaPierre
+
+	* Added the autotools support.
+
+2005-04-07  The SFLPhone Team
+
+	* Version 0.3
+
+2005-01-18  The SFLPhone Team
+
+	* Version 0.2
+
+2004-12-21  The SFLPhone Team
+
+	* Version 0.1 (initial release)

FIXME

@@ -1,4 +0,0 @@
-- sflphoned don't return any result at the second time getcallstatus is called.
-- sflphoned don't return a 206 on getcallstatus when one call is ringing.
-- unhold should not return an error if it's not holded
-

Makefile.am

@@ -1,5 +1,8 @@
-SUBDIRS = include libs src ringtones skins m4
-EXTRA_DIST = tools/*.sh debian/* README.cvs CHANGES images/*
+# Makefile.am
+
+ACLOCAL_FLAGS = -I m4
+
+SUBDIRS = libs src ringtones skins
+EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/*
 
-ACLOCAL_FLAGS=-I$(top_srcdir)/m4