From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 11 Jan 2011 12:24:06 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20664697dcf4a2eabba2b1831b68f9a713d106e8;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

20664697dcf4a2eabba2b1831b68f9a713d106e8
diff --cc ChangeLog
index 8c5a8f4da,f260ca50b..da43d9163
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,19 +1,28 @@@
+ 2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	tests: work around a texi+cygnus bug causing a spurious XFAIL
+ 	* tests/txinfo5b.test: New test, like txinfo5.test but calling
+ 	automake with the `-Wno-override' option to work around a bug
+ 	in the texinfo + cygnus interaction.
+ 	* tests/txinfo5.test: Update heading comments.
+ 	* tests/Makefile.am (TEST): Updated.
+ 
+ 2011-01-09  Dave Hart  <davehart@gmail.com>  (tiny change)
+ 
+ 	Fix another typo in Rule.pm comment.
+ 	* lib/Automake/Rule.pm: Fix typo.
+ 
 +2011-01-09  Peter Rosin  <peda@lysator.liu.se>
 +
 +	Fix another typo in Rule.pm comment.
 +	* lib/Automake/Rule.pm: Fix typo.
 +
  2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 +	tests: texinfo unrecognized extensions
 +	* tests/txinfo-unrecognized-extension.test: New test.
 +	* tests/Makefile.am (TESTS): Update.
 +
  	Improve, extend and tweak tests on Texinfo support.
  	* tests/instdir-texi.test: Add a call to `ls -l' after that to
  	`make', for debugging.  When looking for required tools, do not