[regexxer] Bump version and generate ChangeLog on make dist

[Daniel Elstner <daniel src gnome org>]

commit c5b25a5421e59933406f48111fa83cb5387c92d0
Author: Daniel Elstner <danielk openismus com>
Date:   Wed Sep 9 05:25:13 2009 +0200

    Bump version and generate ChangeLog on make dist
    
    * ChangeLog: Insert note saying that the file is now auto-generated.
    * Makefile.am (dist-changelog): New rule to generate the distributed
    ChangeLog file.  Hook up to dist-hook.
    * configure.ac (AC_INIT): Increment version to regexxer 0.10.
    (AC_PREREQ): Require Autoconf >= 2.59.
    (AM_INIT_AUTOMAKE): Require Automake >= 1.9.  Use dist-bzip2 option.
    * NEWS: Start news entry for regexxer 0.10 release.
    * autogen.sh: Pass --verbose option to autoreconf.

 .gitignore   |    1 +
 ChangeLog    |    3 +++
 Makefile.am  |   19 ++++++++++++++++++-
 NEWS         |    4 ++++
 autogen.sh   |    2 +-
 configure.ac |    7 ++++---
 6 files changed, 31 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2467b5e..a8ce32f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,5 @@ Makefile.in
 /intltool-*.in
 /missing
 /mkinstalldirs
+/regexxer-*.tar.*
 /m4/intltool.m4
diff --git a/ChangeLog b/ChangeLog
index 7a87df4..c38df95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+The ChangeLog is now auto-generated when releasing.  If you
+are seeing this, use 'git log' for a detailed list of changes.
+
 0.9:
 
 2007-02-18  Daniel Elstner  <daniel kitta gmail com>
diff --git a/Makefile.am b/Makefile.am
index 2f13daa..6647adc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,6 +119,8 @@ install-data-hook: install-update-icon-cache
 uninstall-hook: uninstall-update-icon-cache
 endif
 
+dist-hook: dist-changelog
+
 # Note that this rule creates the ui/ build directory as a side effect.
 # This works just fine because the target is in BUILT_SOURCES and thus
 # built before everything else.  Otherwise a special ui/.dirstamp rule
@@ -134,6 +136,18 @@ ui/stockimages.h: $(stockimages)
 	echo " $(pixbuf_csource) $$build_list >$@"; \
 	$(pixbuf_csource) $$build_list >$@
 
+dist-changelog:
+	@if test -r "$(top_srcdir)/.git"; then \
+	  if git --git-dir="$(top_srcdir)/.git" --work-tree="$(top_srcdir)" \
+		log --date=short --pretty='format:%cd  %an  <%ae>%n%n%s%n%n%b%n' \
+	  | sed	-e '/^[12]...-[01].-[0123].  [^<>]*  <[^<>]*>$$/,/^$$/ b' \
+		-e '/[^	 ]/,/^[	 ]*$$/! d' \
+		-e 's/^[	 ]*/	/' \
+		-e 's/^[	 ]*$$//' >.ChangeLog.tmp; \
+	  then mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
+	  else rm -f .ChangeLog.tmp; exit 1; fi; \
+	fi
+
 install-schemas: $(schemas_DATA)
 	@$(POST_INSTALL)
 	test -n "$(DESTDIR)" || $(gconftool) --makefile-install-rule $(schemas_DATA)
@@ -150,4 +164,7 @@ uninstall-update-icon-cache:
 	@$(POST_UNINSTALL)
 	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
 
-.PHONY: install-schemas uninstall-schemas install-update-icon-cache uninstall-update-icon-cache
+.PHONY: dist-changelog install-schemas uninstall-schemas \
+	install-update-icon-cache uninstall-update-icon-cache
+
+.DELETE_ON_ERROR:
diff --git a/NEWS b/NEWS
index cff56e4..49f6ca7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+regexxer 0.10 (2009-??-??)
+
+	* New maintainer: Fabien Parent
+
 regexxer 0.9 (2007-02-18)
 
 	* Command line option support
diff --git a/autogen.sh b/autogen.sh
index 762b95f..314bc97 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,6 @@ test -n "$srcdir" || srcdir=`dirname "$0"`
 test -n "$srcdir" || srcdir=.
 (
   cd "$srcdir" &&
-  AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install
+  AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 ) || exit
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index 50d1b0e..8f46030 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,14 +16,15 @@
 ## along with regexxer; if not, write to the Free Software Foundation, Inc.,
 ## 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-AC_INIT([regexxer], [0.9], [http://regexxer.sourceforge.net/bugs], [regexxer])
-AC_PREREQ([2.58])
+AC_INIT([regexxer], [0.10], [http://regexxer.sourceforge.net/bugs], [regexxer],
+        [http://regexxer.sourceforge.net/])
+AC_PREREQ([2.59])
 
 AC_CONFIG_SRCDIR([ui/regexxer.desktop.in])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.8 -Wall gnu no-define nostdinc check-news])
+AM_INIT_AUTOMAKE([1.9 -Wall gnu no-define nostdinc check-news dist-bzip2])
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
 AC_PROG_CC