tags 11356 + patch
severity 11356 minor
close 11356
thanks
On 04/27/2012 05:30 AM, Peter Johansson wrote:
> Hello,
>
Hi Peter, thanks for the report.
> Just a tiny nit. After installing the new version (1.12) of
> automake I noticed that 'automake --version' outputs:
>
> automake (GNU automake) 1.12
> Copyright (C) 2011 Free Software Foundation, Inc.
>
> whereas I expected it to say 'Copyright (C) 2012...'
>
Fixed with the attached patch (pushed to maint).
Regards,
Stefano
>From b99b5be0d88d69698f71a5cc85d841c9816f3031 Mon Sep 17 00:00:00 2001
Message-Id: <b99b5be0d88d69698f71a5cc85d841c9816f3031.1335518276.git.stefano.lattar...@gmail.com>
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Fri, 27 Apr 2012 11:14:53 +0200
Subject: [PATCH] automake, aclocal: update copyright year in output
Fixes automake bug#11356.
* aclocal.in, automake.in: Add copyright year '2012' in the version
message. Ditto for the copyright notice in the generated Makefile.in
or aclocal.m4 files; and for those, since we are at it, prefer using
a range for copyright years, rather than listing each copyright year
individually.
Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com>
---
aclocal.in | 7 +++----
automake.in | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/aclocal.in b/aclocal.in
index 85528af..1c58fb5 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -840,9 +840,8 @@ $output";
# name in the header.
$output = "# generated automatically by aclocal $VERSION -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -936,7 +935,7 @@ sub version()
{
print <<EOF;
aclocal (GNU $PACKAGE) $VERSION
-Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl-2.0.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
diff --git a/automake.in b/automake.in
index 43a7ba6..544f893 100644
--- a/automake.in
+++ b/automake.in
@@ -252,9 +252,8 @@ my %standard_prefix =
# Copyright on generated Makefile.ins.
my $gen_copyright = "\
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -8315,7 +8314,7 @@ sub version ()
{
print <<EOF;
automake (GNU $PACKAGE) $VERSION
-Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl-2.0.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
--
1.7.9.5
