]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'minor'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 21 Apr 2014 14:12:29 +0000 (15:12 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 21 Apr 2014 14:12:29 +0000 (15:12 +0100)
* minor:
  maint: update copyright years
  maint: sync files from upstream ("make fetch")

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
78 files changed:
1  2 
NEWS
bin/aclocal.in
bin/automake.in
bootstrap.sh
configure.ac
doc/automake.texi
lib/Automake/Language.pm
lib/Automake/Makefile.inc
lib/Automake/Options.pm
lib/Automake/Variable.pm
lib/am/depend2.am
lib/am/distdir.am
lib/am/texibuild.am
lib/am/texinfos.am
lib/depcomp
lib/ylwrap
m4/Makefile.inc
m4/amversion.m4
m4/depend.m4
m4/init.m4
m4/obsolete.m4
maintainer/syntax-checks.mk
old/TODO
t/aclocal-acdir.sh
t/aclocal-amflags.sh
t/aclocal-deleted-header-aclocal-amflags.sh
t/aclocal-dirlist.sh
t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
t/aclocal-path-precedence.sh
t/autodist-configure-no-subdir.sh
t/ax/distcheck-hook-m4.am
t/backcompat6.sh
t/compile_f_c_cxx.sh
t/cscope.tap
t/depcomp8a.sh
t/depcomp8b.sh
t/dist-missing-m4.sh
t/dist-shar.sh
t/dist-tarZ.sh
t/fort2.sh
t/fort4.sh
t/fort5.sh
t/gcj.sh
t/gettext-macros.sh
t/help.sh
t/includes-deprecation.sh
t/lex-line.sh
t/libobj20b.sh
t/libobj20c.sh
t/libtool-macros.sh
t/libtool3.sh
t/list-of-tests.mk
t/ltlibsrc.sh
t/pluseq5.sh
t/pr401.sh
t/pr401b.sh
t/pr401c.sh
t/remake-deleted-m4-file.sh
t/remake-gnulib-add-acsubst.sh
t/remake-gnulib-add-header.sh
t/remake-gnulib-remove-header.sh
t/remake-moved-m4-file.sh
t/remake-renamed-m4-file.sh
t/remake-renamed-m4-macro-and-file.sh
t/remake-renamed-m4-macro.sh
t/silent-nested-vars.sh
t/subobj.sh
t/subobj11a.sh
t/subpkg-yacc.sh
t/subpkg.sh
t/txinfo-makeinfo-error-no-clobber.sh
t/txinfo-no-extra-dist.sh
t/warnings-obsolete-default.sh
t/warnopts.sh
t/werror2.sh
t/xsource.sh
t/yacc-grepping2.sh
t/yacc-line.sh

diff --cc NEWS
Simple merge
diff --cc bin/aclocal.in
Simple merge
diff --cc bin/automake.in
Simple merge
diff --cc bootstrap.sh
index c8eb5def997f9cd731c0a3a5cc2a07b086e34229,45b42bb003982929fd1d4184f1750d103986c408..0ae381e2a3148c0046f9c4e0dd4e75dcb15f14c7
@@@ -39,8 -37,17 +39,8 @@@ PACKAGE=automak
  datadir=.
  # This should be automatically updated by the 'update-copyright'
  # rule of our Makefile.
- RELEASE_YEAR=2013
+ RELEASE_YEAR=2014
  
 -# Override SHELL.  This is required on DJGPP so that Perl's system()
 -# uses bash, not COMMAND.COM which doesn't quote arguments properly.
 -# It's not used otherwise.
 -if test -n "$DJDIR"; then
 -  BOOTSTRAP_SHELL=/dev/env/DJDIR/bin/bash.exe
 -else
 -  BOOTSTRAP_SHELL=/bin/sh
 -fi
 -
  # Read the rule for calculating APIVERSION and execute it.
  apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac`
  eval "$apiver_cmd"
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/depcomp
Simple merge
diff --cc lib/ylwrap
Simple merge
diff --cc m4/Makefile.inc
Simple merge
diff --cc m4/amversion.m4
Simple merge
diff --cc m4/depend.m4
Simple merge
diff --cc m4/init.m4
Simple merge
diff --cc m4/obsolete.m4
index 28151d8d1a50bd154e3eca9fcb0fbab7ca8d2d17,9905156a6f11415e779cf615f281bbc2e5202407..9579f820a72bd0d2e9c94b84c16abe7b8126aaea
@@@ -1,7 -1,8 +1,7 @@@
  #  -*- Autoconf -*-
 -# Obsolete and "removed" macros, that must however still report explicit
 -# error messages when used, to smooth transition.
 +# Deprecated, obsolescent or and obsolete macros.
  #
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2014 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
Simple merge
diff --cc old/TODO
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/cscope.tap
Simple merge
diff --cc t/depcomp8a.sh
Simple merge
diff --cc t/depcomp8b.sh
Simple merge
Simple merge
diff --cc t/dist-shar.sh
Simple merge
diff --cc t/dist-tarZ.sh
Simple merge
diff --cc t/fort2.sh
Simple merge
diff --cc t/fort4.sh
Simple merge
diff --cc t/fort5.sh
Simple merge
diff --cc t/gcj.sh
Simple merge
Simple merge
diff --cc t/help.sh
Simple merge
Simple merge
diff --cc t/lex-line.sh
Simple merge
diff --cc t/libobj20b.sh
Simple merge
diff --cc t/libobj20c.sh
Simple merge
Simple merge
diff --cc t/libtool3.sh
Simple merge
Simple merge
diff --cc t/ltlibsrc.sh
Simple merge
diff --cc t/pluseq5.sh
Simple merge
diff --cc t/pr401.sh
Simple merge
diff --cc t/pr401b.sh
Simple merge
diff --cc t/pr401c.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/subobj.sh
Simple merge
diff --cc t/subobj11a.sh
Simple merge
Simple merge
diff --cc t/subpkg.sh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/warnopts.sh
Simple merge
diff --cc t/werror2.sh
Simple merge
diff --cc t/xsource.sh
Simple merge
Simple merge
diff --cc t/yacc-line.sh
Simple merge