[git] Pinentry - The standard pinentry collection branch, master, updated. pinentry-0.8.1-1-g5190773

by Werner Koch cvs at cvs.gnupg.org
Mon Jan 3 18:02:23 CET 2011


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 standard pinentry collection".

The branch, master has been updated
       via  5190773293bc38550bbc8aeb1b539bfb47a47c78 (commit)
      from  568752d51660a23041650d37674adb89fbd3bd94 (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 5190773293bc38550bbc8aeb1b539bfb47a47c78
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jan 3 17:44:07 2011 +0100

    Append a git commit id.

diff --git a/configure.ac b/configure.ac
index fe5904e..4b8ed79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,15 +31,18 @@ min_automake_version="1.10"
 # specific feature can already be done under the assumption that the
 # SVN version is the most recent one in a branch.  To disable the SVN
 # version for the real release, set the my_issvn macro to no.
-m4_define(my_version, [0.8.1])
-m4_define(my_issvn, [no])
+m4_define(my_version, [0.8.2])
+m4_define(my_issvn, [yes])
 
 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}']))
 # Remember to remove the "-cvs" suffix *before* a release and to bump the
 # version number immediately *after* a release and to re-append the suffix.
 AC_INIT(pinentry,
-        [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
+        [my_version[]m4_if(my_issvn,[yes],
+        [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
 	[gnupg-devel at gnupg.org])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(pinentry/pinentry.h)

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

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


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org




More information about the Gnupg-commits mailing list