[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-26-g495dc68

by Werner Koch cvs at cvs.gnupg.org
Wed Jan 25 13:09:09 CET 2012


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 Guard".

The branch, master has been updated
       via  495dc68586356891b82a2d2b6367c4131fd17f08 (commit)
      from  2a5f61c4779eb9b24a11296c2f422fa0d694463b (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 495dc68586356891b82a2d2b6367c4131fd17f08
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 25 12:11:41 2012 +0100

    Require gitlog-to-changelog to be installed.
    
    * Makefile.am (GITLOG_TO_CHANGELOG): New.
    (gen-ChangeLog): Use installed version of gitlog-to-changelog.
    --
    
    In case an appropriate version of gitlog-to-changelog is not in the
    PATH, it is possible to override it using something like:
    
      make distcheck GITLOG_TO_CHANGELOG=/foo/bar/my-gitlog-to-changelog

diff --git a/Makefile.am b/Makefile.am
index 49ec3fc..6207d7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,8 @@ ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
+GITLOG_TO_CHANGELOG=gitlog-to-changelog
+
 EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \
 	     ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \
 	     scripts/gitlog-to-changelog \
@@ -115,8 +117,7 @@ gen_start_date = 2011-12-01T06:00:00
 gen-ChangeLog:
 	if test -d $(top_srcdir)/.git; then				\
 	  (cd $(top_srcdir) &&                      			\
-	    ./scripts/gitlog-to-changelog				\
-	    --append-dot --tear-off					\
+	    $(GITLOG_TO_CHANGELOG) --append-dot --tear-off		\
 	    --amend=scripts/git-log-fix	 				\
 	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
           cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \

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

Summary of changes:
 Makefile.am |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


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




More information about the Gnupg-commits mailing list