Merge branch 'master' of...

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

NEWS

@@ -2,6 +2,8 @@
 # SFLphone
 ################################################
 
+* 2010-04-09: 0.9.8 rc1 has been released
+
 * 2010-03-25: 0.9.8 beta has been released
 
 * 2009-12-10: SFLphone 0.9.7 has been released

sflphone-client-gnome/VERSION

-0.9.8~beta
+0.9.8~rc1

sflphone-client-gnome/configure.ac

-AC_INIT([SFLphone],[0.9.8~beta],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([SFLphone],[0.9.8~rc1],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
 AM_CONFIG_HEADER(config.h)
 
 LT_INIT

sflphone-client-gnome/doc/C/sflphone.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"  [
 	<!ENTITY app "SFLphone">
-	<!ENTITY appversion "0.9.8~beta">
+	<!ENTITY appversion "0.9.8~rc1">
 	<!ENTITY docversion "1.0">
 ]>
 

sflphone-common/VERSION

-0.9.8~beta
+0.9.8~rc1

sflphone-common/configure.ac

@@ -3,7 +3,7 @@ dnl
 
 	dnl Process this file with autoconf to produce a configure script.
 	AC_PREREQ(2.59)
-	AC_INIT([sflphone],[0.9.8~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
+	AC_INIT([sflphone],[0.9.8~rc1],[sflphoneteam@savoirfairelinux.com],[sflphone])
 	AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
 AC_REVISION([$Revision$])
 

sflphone-common/src/global.h

@@ -33,7 +33,7 @@
 #include <vector>
 #include "logger.h"
 
-#define SFLPHONED_VERSION "0.9.8~beta"		/** Version number */
+#define SFLPHONED_VERSION "0.9.8~rc1"		/** Version number */
 
 #define HOMEDIR					(getenv ("HOME"))				/** Home directory */
 #define XDG_DATA_HOME			(getenv ("XDG_DATA_HOME"))