From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 31 Dec 2012 17:30:40 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=288402413a6fa94ba7be34abcae43a2d184f0173;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  maint: update copyright year for 2013 (in branch master)
  maint: update copyright year for 2013 (in branch maint)
---

288402413a6fa94ba7be34abcae43a2d184f0173
diff --cc lib/missing
index 4e7fc4827,cdea51493..cf418e43d
--- a/lib/missing
+++ b/lib/missing
@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # Common wrapper for a few potentially missing GNU programs.
  
 -scriptversion=2012-06-26.16; # UTC
 +scriptversion=2012-06-27.11; # UTC
  
- # Copyright (C) 1996-2012 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
  # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
  
  # This program is free software; you can redistribute it and/or modify
diff --cc m4/init.m4
index febfe895a,753570606..aa32ca681
--- a/m4/init.m4
+++ b/m4/init.m4
@@@ -1,6 -1,6 +1,6 @@@
 -# Do all the work for Automake.                             -*- Autoconf -*-
 +# Do all the work for Automake-NG.                         -*- Autoconf -*-
  
- # Copyright (C) 1996-2012 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
diff --cc syntax-checks.mk
index 1231d6b79,05ed15ec3..fc62b7ce9
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@@ -1,6 -1,6 +1,6 @@@
 -# Maintainer checks for Automake.  Requires GNU make.
 +# Maintainer checks for Automake-NG.
  
- # Copyright (C) 2012 Free Software Foundation, Inc.
+ # Copyright (C) 2012-2013 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
diff --cc t/depcomp-shuffle-vpath.sh
index 11d4a7ed7,000000000..2f682d264
mode 100755,000000..100755
--- a/t/depcomp-shuffle-vpath.sh
+++ b/t/depcomp-shuffle-vpath.sh
@@@ -1,23 -1,0 +1,22 @@@
- #! /bin/sh
 +# Copyright (C) 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
 +# the Free Software Foundation; either version 2, or (at your option)
 +# any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +# Dependency tracking in the face of added/removed/renamed files.
 +#  - VPATH build
 +#  - no use of subdir objects
 +
 +. test-lib.sh
 +xdir='' vpath='yes'
 +. depcomp-shuffle.sh
diff --cc t/stdinc-no-repeated.sh
index 6fe775bfb,b87ceb8bd..48fcf95db
--- a/t/stdinc-no-repeated.sh
+++ b/t/stdinc-no-repeated.sh
@@@ -1,5 -1,5 +1,5 @@@
- #!/bin/sh
+ #! /bin/sh
 -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 +# Copyright (C) 2009-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