Merge branch 'maint'

* maint:
  tests: fix spurious failure due to autom4te caching
  vala: fix name of temporary file used in vala rules
  vala tests: add missing 'valac' requirement, and other minor fixlets
  news: fix grammaro

diff --cc NEWS
Simple merge

diff --cc automake.in
Simple merge

diff --cc tests/lzma.test
index 28b4198,bf65aea..f0c284b
--- 1/tests/lzma.test
--- 2/tests/lzma.test
+++ b/tests/lzma.test
@@@ -1,5 -1,5 +1,5 @@@
  #! /bin/sh
--# Copyright (C) 2003, 2007, 2011 Free Software Foundation, Inc.
++# Copyright (C) 2003, 2007, 2011, 2012 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@@ -31,10 -33,24 +31,11 @@@ AM_INIT_AUTOMAKE([no-dist-gzip dist-lzm
  AC_CONFIG_FILES([Makefile])
  AC_OUTPUT
  END
 -
 -cat > Makefile.am << 'END'
 -test: distcheck
 -      test $(DIST_ARCHIVES) = lzma-1.0.tar.lzma
 -      test -f $(DIST_ARCHIVES)
 -END
 +: > Makefile.am
  
- $ACLOCAL --force
+ rm -rf autom4te*.cache
+ $ACLOCAL
 -AUTOMAKE_fails
 +AUTOMAKE_fails -Wnone -Wno-error
  grep "^configure\\.in:2:.*$errmsg" stderr
  
 -$AUTOMAKE -Wno-obsolete
 -
 -lzma --version || skip_ "lzma compressor required for the rest of the test"
 -
 -$AUTOCONF
 -./configure
 -$MAKE test
 -
  :

diff --cc tests/vala.test
Simple merge