[Commits] [SCM] claws branch, master, updated. 3.9.0-160-g6eabcd7

[mones at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  6eabcd7eee9cdc2d5424e31303831f743adcd814 (commit)
      from  385e20eea99937c7c6589b1f39ef4af83fba4603 (commit)


- Log -----------------------------------------------------------------
commit 6eabcd7eee9cdc2d5424e31303831f743adcd814
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Mar 22 00:41:35 2013 +0100

    Complete fix for 'make dist' generated tarballs
    
    Ignore the EXTRA_VERSION when it's too long to be a number
    and is one of:
     * an abbreviated hash (should not happen :)
     * the 'dirty' string (in a modified tree just after a release)

diff --git a/configure.ac b/configure.ac
index e129d9f..21a0aae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ MINOR_VERSION=`echo $GIT_VERSION | awk -F. '{print $2}'`
 MICRO_VERSION=`echo $GIT_VERSION | awk -F- '{print $1}' | awk -F. '{print $3}'`
 EXTRA_VERSION=`echo $GIT_VERSION | awk -F- '{print $2}'`
 
-if test \( "x$EXTRA_VERSION" != "x" \); then
+if test \( "x$EXTRA_VERSION" != "x" -a `echo -n $EXTRA_VERSION | wc -c` -lt 5 \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}git${EXTRA_VERSION}
 else
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}

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

Summary of changes:
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Claws Mail