From 2336b09779d313c1594acf6df3bd8a8486e90458 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 1 Dec 2011 10:51:36 +0100
Subject: Generate the ChangeLog from commit logs.

* scripts/gitlog-to-changelog: New script.  Taken from gnulib.
* scripts/git-log-fix: New file.
* scripts/git-log-footer: New file.
* doc/HACKING: Describe the ChangeLog policy
* ChangeLog: New file.
* Makefile.am (EXTRA_DIST): Add new files.
(gen-ChangeLog): New.
(dist-hook): Run gen-ChangeLog.

Rename all ChangeLog files to ChangeLog-2011.
---
 Makefile.am | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 23edae4e3..292748abc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,12 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
-DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto
+DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
-EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT
+EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \
+	     ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \
+	     scripts/gitlog-to-changelog \
+	     scripts/git-log-fix scripts/git-log-footer
 DISTCLEANFILES = g10defs.h
 
 if BUILD_GPGSM
@@ -90,7 +93,7 @@ SUBDIRS = m4 gl include common ${kbx} \
 dist_doc_DATA = README
 
 
-dist-hook:
+dist-hook: gen-ChangeLog
 	echo "$(VERSION)" > $(distdir)/VERSION
 
 if HAVE_W32_SYSTEM
@@ -106,5 +109,20 @@ install-data-hook:
 	done
 endif
 
+
+gen_start_date = 2011-12-01T06:00:00
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+	if test -d $(top_srcdir)/.git; then				\
+	  (cd $(top_srcdir) &&                      			\
+	    ./scripts/gitlog-to-changelog				\
+	    --amend=scripts/git-log-fix	 				\
+	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
+          cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \
+	  rm -f $(distdir)/ChangeLog;					\
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+	fi
+
+
 stowinstall:
 	$(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/gnupg
-- 
cgit v1.2.3


From 14e4fdc9f97d6f12bf563adfff1e3157305d7795 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 7 Dec 2011 11:07:21 +0100
Subject: Correct punctuation in the ChangeLog summary line.

* Makefile.am (gen-ChangeLog): Supply --append-dot.
---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 292748abc..5f9bf2ebf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,6 +116,7 @@ gen-ChangeLog:
 	if test -d $(top_srcdir)/.git; then				\
 	  (cd $(top_srcdir) &&                      			\
 	    ./scripts/gitlog-to-changelog				\
+	    --append-dot						\
 	    --amend=scripts/git-log-fix	 				\
 	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
           cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \
-- 
cgit v1.2.3


From ea0a21410b8fa460882c0f8de90b9291345fd4fc Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 12 Dec 2011 20:28:58 +0100
Subject: gitlog-to-changelog: New option --tear-off.

* scripts/gitlog-to-changelog: Add option --tear-off.
* Makefile.am (gen-ChangeLog): Use that option.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 5f9bf2ebf..49ec3fc78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,7 +116,7 @@ gen-ChangeLog:
 	if test -d $(top_srcdir)/.git; then				\
 	  (cd $(top_srcdir) &&                      			\
 	    ./scripts/gitlog-to-changelog				\
-	    --append-dot						\
+	    --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;  \
-- 
cgit v1.2.3