From c068bb5aeaf5aa13b3e8a59e6299e127f1408427 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Fri, 29 Jan 2010 07:02:36 +0100
Subject: [PATCH] Add a lot release maintenance targets to the Makefile.am

---
 Makefile.am | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6e9c736..df64ba6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,18 +90,63 @@ test_manual.txt: doc/asciidoc.pawk tests/test.sh
 .txt.ps: .txt
 	a2x -f ps $<
 
-README: nobug_manual.txt
-	cp nobug_manual.txt $(top_srcdir)/README || true
-
 doc: nobug_manual.html nobug_manual.pdf
-
 # TODO create manpage
 
-ChangeLog:
-	git whatchanged | sed -e 's/:.*\.\.\.//' > $(top_srcdir)/ChangeLog
-
-release: dist ChangeLog README
+README: nobug_manual.txt
+	cp nobug_manual.txt $(top_srcdir)/README || true
+	git add $(top_srcdir)/README
+
+ChangeLog.new:
+	cd $(top_srcdir);										\
+	git whatchanged --pretty=format:"%n%ai %h%n%aN <%aE>%n%n%s%n%n%b" latest-release..HEAD |	\
+	 sed -e 's/^:.*\.\.\.//' >ChangeLog.new;
+
+
+ChangeLog: ChangeLog.new
+	cd $(top_srcdir);					\
+	mv ChangeLog ChangeLog.bak;				\
+	echo >.newline;						\
+	cat ChangeLog.new .newline ChangeLog.bak >ChangeLog;	\
+	rm .newline ChangeLog.new;				\
+	git add ChangeLog
+
+NEWS.new:
+	@cd $(top_srcdir);					\
+	admin/get_version.sh >NEWS.new;				\
+	echo "--------" >>NEWS.new;				\
+	date "+%d %b %Y" >>NEWS.new;				\
+	git shortlog latest-release..HEAD >>NEWS.new;		\
+	echo -e "\n EDIT NEWS.new and then hit enter\n";	\
+	read;
+
+NEWS: NEWS.new
+	cd $(top_srcdir);				\
+	mv NEWS NEWS.old;				\
+	echo >.newline;					\
+	cat NEWS.new .newline .newline NEWS.old > NEWS;	\
+	rm .newline NEWS.new;				\
+	git add NEWS;
+
+
+release-tag: NEWS ChangeLog README
+	cd $(top_srcdir); \
+	git commit -m "This is release $(shell admin/get_version.sh)"; \
+	git tag -s $(shell admin/get_version.sh); \
+	git tag -f latest-release;
+
+
+release-2nd: release-tag
 	list='$(DIST_ARCHIVES)'; for i in $$list; do \
 		gpg -s $$i;\
 		rm $$i;\
 	done
+
+
+versionbump:
+	cd $(top_srcdir); \
+	admin/update_version.sh; \
+	git add configure.ac;
+
+release: versionbump
+	$(MAKE) release-2nd
-- 
2.11.4.GIT