[git] GPA - branch, master, updated. gpa-0.9.3-5-gf33e483

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Assistant".

The branch, master has been updated
       via  f33e483ffc6dafe9b532f557237fd2352aadbd64 (commit)
       via  60585dad48784313984c33aadbc4b74ff68af068 (commit)
      from  dc37a3e81712ffba565002c5e66cba1e62b108aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f33e483ffc6dafe9b532f557237fd2352aadbd64
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 13:55:26 2012 +0100

    Improve parsing of the GIT revision number.
    
    * configure.ac (git_revision): Use git rev-parse.

diff --git a/configure.ac b/configure.ac
index 8a72808..87d857c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@ m4_define(my_issvn, no)
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
-m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
-          | awk '/^\* / {printf "%s",$3}']))
+m4_define([git_revision],
+          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
 m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
           [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
 AC_INIT([gpa],[my_full_version],[http://bugs.gnupg.org])
@@ -412,3 +412,10 @@ doc/Makefile
 
 
 AC_OUTPUT
+
+echo "
+        GPA v${VERSION} has been configured as follows:
+
+        Revision:        git_revision
+        Platform:        $host
+"

commit 60585dad48784313984c33aadbc4b74ff68af068
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 13:52:04 2012 +0100

    Fix non-portable use of chmod in autogen.sh.
    
    * autogen.sh: Remove option -c from chmod.

diff --git a/autogen.sh b/autogen.sh
index f9be59e..b8edcbe 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -214,7 +214,7 @@ if [ -d .git ]; then
     and .git/hooks/pre-commit.sample out of the way.
 EOF
       cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
-      chmod -c +x  .git/hooks/pre-commit
+      chmod +x  .git/hooks/pre-commit
   fi
   tmp=$(git config --get filter.cleanpo.clean)
   if [ "$tmp" != "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
@@ -228,7 +228,7 @@ EOF
 *** Activating commit log message check hook. ***
 EOF
       cp -av build-aux/git-hooks/commit-msg .git/hooks/commit-msg
-      chmod -c +x  .git/hooks/commit-msg
+      chmod +x  .git/hooks/commit-msg
   fi
 fi
 

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

Summary of changes:
 autogen.sh   |    4 ++--
 configure.ac |   11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Assistant
http://git.gnupg.org