[Commits] [SCM] claws branch, master, updated. 3.9.0-151-gfe4582c

[colin at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  fe4582c867840af8034943badccfacbdaa9733bf (commit)
       via  9eb9b32a409bb5c51fee07bca5c441bf4c8c03e7 (commit)
      from  cbfce9aaed739b5ec4979241653cc45d5641916e (commit)


- Log -----------------------------------------------------------------
commit fe4582c867840af8034943badccfacbdaa9733bf
Author: Colin Leroy <colin at colino.net>
Date:   Wed Mar 20 15:42:14 2013 +0100

    Make the mainwindow's version string shorter when
    not using maintainer mode

diff --git a/configure.ac b/configure.ac
index cb318b6..4c4b18d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,8 +17,6 @@ MAJOR_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f1 -d.`
 MINOR_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f2 -d.`
 MICRO_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f3 -d.`
 EXTRA_VERSION=`echo $GIT_VERSION | cut -f2 -d-`
-HASH_VERSION=`echo $GIT_VERSION | cut -f3 -d-`
-DIRTY_VERSION=`echo $GIT_VERSION | cut -f4 -d-`
 
 if test \( "x$EXTRA_VERSION" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}git${EXTRA_VERSION}
@@ -167,7 +165,7 @@ fi
 CFLAGS="$CFLAGS -Wall"
 
 if test $USE_MAINTAINER_MODE = yes; then
-	CFLAGS="-g -Wall -Wno-pointer-sign"
+	CFLAGS="-g -Wall -Wno-pointer-sign -DUSE_MAINTAINER_MODE"
 fi
 
 pthread_name=
diff --git a/src/common/version.h.in b/src/common/version.h.in
index 071b206..957a5cd 100644
--- a/src/common/version.h.in
+++ b/src/common/version.h.in
@@ -26,11 +26,16 @@
 					  (((guint32)c) <<  8) |  ((guint32)d)      )
 
 #define PACKAGE			"@PACKAGE@"
+#define PACKAGE_FRIENDLY	"Claws Mail"
 #define VERSION			"@VERSION@"
-#define PROG_VERSION		"Claws Mail "VERSION
+#define RELEASE_VERSION		"@MAJOR_VERSION at .@MINOR_VERSION at .@MICRO_VERSION@"
+#define PROG_VERSION		PACKAGE_FRIENDLY" "VERSION_GIT_FULL
+#ifdef USE_MAINTAINER_MODE
+#define PROG_VERSION_FRIENDLY	PROG_VERSION
+#else
+#define PROG_VERSION_FRIENDLY	PACKAGE_FRIENDLY" "RELEASE_VERSION
+#endif
 #define VERSION_NUMERIC		MAKE_NUMERIC_VERSION(@MAJOR_VERSION@, @MINOR_VERSION@, \
 						     @MICRO_VERSION@, @EXTRA_VERSION@)
 #define VERSION_GIT_FULL	"@GIT_VERSION@"
-#define VERSION_GIT_HASH	"@HASH_VERSION@"
-
 #endif /* __VERSION_H__ */
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 5398ba2..c72e200 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1605,7 +1605,7 @@ MainWindow *main_window_create()
 
 	/* main window */
 	window = GTK_WIDGET(gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"));
-	gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
+	gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION_FRIENDLY);
 	gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 #ifdef GENERIC_UMPC
 	prefs_common.layout_mode = SMALL_LAYOUT;
@@ -2802,9 +2802,9 @@ static void main_window_show_cur_account(MainWindow *mainwin)
 			   : _("none"));
 
 	if (cur_account)
-		buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION);
+		buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION_FRIENDLY);
 	else
-		buf = g_strdup(PROG_VERSION);
+		buf = g_strdup(PROG_VERSION_FRIENDLY);
 	gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
 	g_free(buf);
 

commit 9eb9b32a409bb5c51fee07bca5c441bf4c8c03e7
Author: Colin Leroy <colin at colino.net>
Date:   Wed Mar 20 15:15:48 2013 +0100

    Finish removing references to CVS

diff --git a/README b/README
index 29b3484..57bd09c 100644
--- a/README
+++ b/README
@@ -796,17 +796,15 @@ http://www.thewildbeast.co.uk/claws-mail/bugzilla/index.cgi
   a. Downloading
   --------------
 
-  To download the latest cvs cd to the directory where you wish to download
+  To download the latest Git, cd to the directory where you wish to download
   to and type the following information:
 
-  export CVS_RSH=ssh
-  cvs -z3 -d:pserver:anonymous at claws-mail.org:/ co -r gtk2 claws 
+  git clone http://git.claws-mail.org/readonly/claws.git 
 
   Later, when you want to update your local repository, you'll just have to
   go back to the 'claws' directory, and type:
 
-  export CVS_RSH=ssh
-  cvs -z3 update -dPR 
+  git pull --all
 
   b. Installing
   -------------

-----------------------------------------------------------------------

Summary of changes:
 README                  |    8 +++-----
 configure.ac            |    4 +---
 src/common/version.h.in |   11 ++++++++---
 src/mainwindow.c        |    6 +++---
 4 files changed, 15 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Claws Mail