Merge branch 'master' into ng/master

* master:
  news: remove older entry for "future backward incompatibilities"
  news: document fixes for bug#11222 and bug#11229
  vala: fix distcheck with c/vala mixed projects
  news: fix typo
  vala: fix vapi files handling
  vala: test vapi files handling (still failing)

diff --cc automake.in
index cadb0839ea9ceb23659ba6b3575a40b1ba78583d,7930ff1ed1b859d8ed40a35b9d4e3a0f5bf96f16..820285b487671c992ccfa1db70624328cc4a4c3b
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
@@@ -5742,8 -5829,9 +5745,9 @@@ sub lang_vala_finish_target ($$
        $output_rules .= "\$(srcdir)/$c_file: \$(srcdir)/${derived}_vala.stamp\n"
          . "\t\@if test -f \$@; then :; else rm -f \$(srcdir)/${derived}_vala.stamp; fi\n"
          . "\t\@if test -f \$@; then :; else \\\n"
 -        . "\t  \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; \\\n"
 +        . "\t  \$(MAKE) \$(srcdir)/${derived}_vala.stamp; \\\n"
          . "\tfi\n"
+         if $c_file =~ s/(.*)\.vala$/$1.c/;
      }
  
    # Add rebuild rules for generated header and vapi files

diff --cc t/list-of-tests.mk
Simple merge

diff --cc t/vala-mix.sh
Simple merge