Merge branch 'master' into m_savard

sflphone-client-gnome/configure.ac

-AC_INIT([SFLphone],[0.9.5~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([SFLphone],[0.9.5~beta],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
 AM_CONFIG_HEADER(config.h)
 
 LT_INIT
 
 PACKAGE=SFLphone
-VERSION=0.9.5~beta
+#VERSION=0.9.5~beta
+VERSION=`head -n 1 debian/changelog | awk '{print $2}' | sed -e 's/(//g' | sed -e 's/)//g'`
 
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 AC_CONFIG_MACRO_DIR([m4])

sflphone-client-gnome/debian/changelog

+sflphone-client-gnome (0.9.5-0ubuntu1~1.gbpf07060) SYSTEM; urgency=low
+
+  ** SNAPSHOT build @f07060721d61850d67b89f24f0415d7237281886 **
+
+  [ Emmanuel Milou ]
+  * [#1220] Add Conflicts: sflphone in debian control files
+  * [#1179] Add liblog4c3 runtime dependency
+  * [#1212] FIx typo error in dependency list for itnrepid
+  * [#1212] FIx .desktop file to point on the right exec
+  * [#1212] Modify changelog replacing tag
+
+  [ Sflphone Project ]
+  * "[#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta"
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
+    04-27
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
+    04-28
+
+  [ Emmanuel Milou ]
+  * [#1212] Restore changelogs
+
+  [ Sflphone Project ]
+
+ -- Sflphone Project <sflphone@mtl.savoirfairelinux.net>  Tue, 28 Apr 2009 12:23:35 -0400
+
 sflphone-client-gnome (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
 
   [ Julien Bonjean ]

sflphone-client-gnome/src/assistant.c

@@ -181,7 +181,7 @@ void build_wizard( void ) {
 GtkWidget* build_intro() {
 	GtkWidget *label;
 
-	wiz->intro = create_vbox( GTK_ASSISTANT_PAGE_INTRO  , "SFLphone 0.9.4" , _("Welcome to SFLphone!"));
+	wiz->intro = create_vbox( GTK_ASSISTANT_PAGE_INTRO  , "SFLphone GNOME client" , _("Welcome to SFLphone!"));
 	label = gtk_label_new(_("This installation wizard will help you configure an account.")) ;
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);

sflphone-client-gnome/src/main.c

@@ -70,7 +70,7 @@ main(int argc, char *argv[])
 
   gtk_init(&argc, &argv);
 
-  g_print("%s\n", PACKAGE_STRING);
+  g_print("%s %s\n", PACKAGE, VERSION);
   g_print("Copyright (c) 2005 2006 2007 2008 2009 Savoir-faire Linux Inc.\n");
   g_print(
       "This is free software.  You may redistribute copies of it under the terms of\n\

sflphone-common/debian/changelog

+sflphone-common (0.9.5-0ubuntu1~1.gbpf07060) SYSTEM; urgency=low
+
+  ** SNAPSHOT build @f07060721d61850d67b89f24f0415d7237281886 **
+
+  [ Emmanuel Milou ]
+  * [#1220] Add Conflicts: sflphone in debian control files
+  * [#1179] Add liblog4c3 runtime dependency
+  * [#1212] FIx typo error in dependency list for itnrepid
+  * [#1212] FIx .desktop file to point on the right exec
+  * [#1212] Modify changelog replacing tag
+
+  [ Sflphone Project ]
+  * "[#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta"
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
+    04-27
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
+    04-28
+
+  [ Emmanuel Milou ]
+  * [#1212] Restore changelogs
+
+  [ Sflphone Project ]
+
+ -- Sflphone Project <sflphone@mtl.savoirfairelinux.net>  Tue, 28 Apr 2009 12:23:29 -0400
+
 sflphone-common (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
 
   [ Julien Bonjean ]