From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 17 Sep 2010 10:00:39 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.11b~537
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27d06b631ca93d1fb9fc3a21013c8fd096270d9c;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint'
---

27d06b631ca93d1fb9fc3a21013c8fd096270d9c
diff --cc ChangeLog
index 5ef4d4e,0328c5a..8c394cc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,28 +1,35 @@@
+ 2010-09-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Test automake-generated portions of configure help screen.
+ 	* tests/help-depend.test: New test.
+ 	* tests/help-depend2.test: Likewise.
+ 	* tests/help-dmalloc.test: Likewise.
+ 	* tests/help-init.test: Likewise.
+ 	* tests/help-lispdir.test: Likewise.
+ 	* tests/help-maintainer.test: Likewise.
+ 	* tests/help-multilib.test: Likewise.
+ 	* tests/help-regex.test: Likewise.
+ 	* tests/help-silent.test: Likewise.
+ 	* tests/help-upc.test: Likewise.
+ 	* tests/mmode.test: Remove tests on `configure --help' output,
+ 	they are supersed by tests in `help-maintainer.test'.
+ 	* tests/Makefile.am (TESTS): Update.
+ 
+ 2010-09-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	* tests/README: Don't put GCS mandated tools in $required.
+ 
+ 2010-09-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	* HACKING: Hint at old commits with `git describe' output.
+ 
 +2010-09-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Prefer `$(am__cd)' to plain `cd' in our Makefiles.
 +	* Makefile.am (recheck, dist-hook, git-dist, path-check, fetch)
 +	(release-stats): Use `$(am__cd)' rather than plain `cd'.
 +	* tests/Makefile.am ($(srcdir)/parallel-tests.am): Likewise.
 +
  2010-09-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	Fix regression in test `colon4.test'.