diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac index eed5be91f23990ba7732f6d5019b64587d4b2447..0fb4d50694f5024225441fa983df0b1133a82d92 100644 --- a/sflphone-client-gnome/configure.ac +++ b/sflphone-client-gnome/configure.ac @@ -1,10 +1,11 @@ -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]) diff --git a/sflphone-client-gnome/debian/changelog b/sflphone-client-gnome/debian/changelog index d300b0cd055bbebb59a56abe1fc783ecd63e042d..f823fa8914e4e82bddb8c64ce217915289648562 100644 --- a/sflphone-client-gnome/debian/changelog +++ b/sflphone-client-gnome/debian/changelog @@ -1,3 +1,45 @@ +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 ] diff --git a/sflphone-client-gnome/src/assistant.c b/sflphone-client-gnome/src/assistant.c index b2d7c8fe6f52316f03f54e21090ea5a7cba845bb..550b8dd770c536e543a413f4adb69f64168ee1a9 100644 --- a/sflphone-client-gnome/src/assistant.c +++ b/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); diff --git a/sflphone-client-gnome/src/main.c b/sflphone-client-gnome/src/main.c index 8593ee5cd93b4ba211de6c05dd8fe505f715e04d..bedccadc0e93908ddb1f63f917e9e9391c806ae1 100644 --- a/sflphone-client-gnome/src/main.c +++ b/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\ diff --git a/sflphone-common/debian/changelog b/sflphone-common/debian/changelog index a1691c2ace56d62464899c4e8ef141689f70832b..377cd5005959f22e3658a66e198bcb9556aa278b 100644 --- a/sflphone-common/debian/changelog +++ b/sflphone-common/debian/changelog @@ -1,3 +1,45 @@ +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 ]