Update instructions for doing a release. Autogen ChangeLog from git-log.2.3.96

2 files changed, 55 insertions, 5 deletions

diff --git a/INSTALL b/INSTALL
index a6dc1df2..928ac1ee 100644
--- a/INSTALL
+++ b/INSTALL
@@ -13,22 +13,33 @@ important steps:
  1.	Update the version numbers
  		configure.in
 		fontconfig/fontconfig.h
+
  2.	Fix the README
  		Change version number
 		Set the date
+		
  3.	Commit those changes
+ 
  4. 	rebuild the configuration files with autogen.sh
  		sh autogen.sh --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man --localstatedir=/var
+		
  5.	make distcheck (NB: won't work without docbook-utils -PL)
+ 
  6.	tag the tree
- 		cvs tag fc-2_2_xx
- 7.	Split out the ChangeLog into ChangeLog-2.2.xx with
- 	the changes since the previous release
- 8.	Copy ChangeLog-2.2.xx and fontconfig-2.2.xx.tar.gz to
+ 		git-tag -u 096c4dd3 -m'Version 2.3.xx' 2.3.xx
+		
+ 7.	make Changelog-2.3.xx
+ 		git-log 2.3.(xx-1).. > ChangeLog-2.3.xx
+		
+ 8.	Copy ChangeLog-2.3.xx and fontconfig-2.2.xx.tar.gz to
+ 
  	freedesktop.org:/srv/fontconfig.freedesktop.org/www/release
+	
  9.	Update the Fontconfig Devel wiki page
  	http://fontconfig.org/wiki/Devel
+	
 10.	Compute md5sums for release files:
-		md5sum fontconfig-2.2.xx.tar.gz ChangeLog-2.2.xx
+		md5sum fontconfig-2.3.xx.tar.gz ChangeLog-2.3.xx
+		
 11.	Post a note to fontconfig@fontconfig.org.  Include the md5sums.
 	gpg sign the message.
diff --git a/Makefile.am b/Makefile.am
index e316d8a8..1b28303a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,21 @@ EXTRA_DIST = \
         fontconfig.spec.in \
         fontconfig.spec \
 	fontconfig-zip.in
+DISTCLEANFILES = config.cache
+MAINTAINERCLEANFILES = \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/autoscan.log \
+	$(srcdir)/compile \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.sub \
+	$(srcdir)/configure.scan \
+	$(srcdir)/depcomp \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	$(srcdir)/mkinstalldirs \
+	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = fontconfig.pc
@@ -45,6 +60,30 @@ else
   RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
 endif
 
+# Creating ChangeLog from git log:
+
+MAINTAINERCLEANFILES += ChangeLog
+
+EXTRA_DIST += ChangeLog
+
+ChangeLog: $(srcdir)/ChangeLog
+
+$(srcdir)/ChangeLog:
+	@if test -d "$(srcdir)/.git"; then \
+	  (cd "$(srcdir)" && \
+	  ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+	  echo A git checkout and git-log is required to generate this file >> $@); \
+	fi
+
+.PHONY: ChangeLog $(srcdir)/ChangeLog
+
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(configdir)
 	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \