Stefano Lattarini wrote:
> Hi Jim.
>
> On 02/12/2012 06:57 PM, Jim Meyering wrote:
>>
>> Here's the adjusted c-set:
>>
>> From 21b627dbec3347c2befde186c65592b9f177cd8d Mon Sep 17 00:00:00 2001
>> From: Jim Meyering <meyer...@redhat.com>
>> Date: Sun, 12 Feb 2012 16:57:42 +0100
>> Subject: [PATCH] maint: add a rule to use gnulib's update-copyright
>>
>> * lib/update-copyright: New file, from gnulib.
>> * Makefile.am (FETCHFILES): Add update-copyright to the list.
>> (fetch): Fetch it.
>> (update-copyright): New rule.
>> ---
>> Makefile.am | 13 ++-
>> lib/update-copyright | 274
>> ++++++++++++++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 286 insertions(+), 1 deletions(-)
>> create mode 100755 lib/update-copyright
>>
> Do you plan to push this change, or should I do so?
Hi Stefano,
I've rebased and pushed it.
FYI, running "make update-copyright" on maint prints this:
git ls-files | grep -Ev 'COPYING|INSTALL' \
| UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=2 xargs
./lib/update-copyright
.gitattributes: warning: copyright statement not found
.gitignore: warning: copyright statement not found
AUTHORS: warning: copyright statement not found
THANKS: warning: copyright statement not found
contrib/README: warning: copyright statement not found
doc/amhello/README: warning: copyright statement not found
lib/ansi2knr.1: warning: copyright statement not found
lib/ansi2knr.c: warning: copyright statement not found
lib/depcomp: warning: copyright statement not found
lib/install-sh: warning: copyright statement not found
lib/mkinstalldirs: warning: copyright statement not found
m4/acdir/dirlist: warning: copyright statement not found
tests/ChangeLog-old: warning: copyright statement not found
tests/README: warning: copyright statement not found
tests/aclocal.in: warning: copyright statement not found
tests/automake.in: warning: copyright statement not found
which looks ok.
I propose to push the result of doing this:
$ git ci -m 'maint: run "make update-copyright"' -a
[maint aafc6b5] maint: run "make update-copyright"
1041 files changed, 1041 insertions(+), 1266 deletions(-)
Here's a truncated version of that 12k-line patch:
>From aafc6b55d7ec32769d2e35724db2547179ea8962 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Tue, 14 Feb 2012 21:50:57 +0100
Subject: [PATCH] maint: run "make update-copyright"
---
ChangeLog.00 | 2 +-
ChangeLog.01 | 2 +-
ChangeLog.02 | 2 +-
ChangeLog.03 | 2 +-
ChangeLog.04 | 2 +-
ChangeLog.09 | 2 +-
ChangeLog.11 | 2 +-
ChangeLog.96 | 2 +-
ChangeLog.98 | 2 +-
HACKING | 3 +--
Makefile.am | 4 +---
NEWS | 4 +---
README | 3 +--
TODO | 3 +--
aclocal.in | 4 +---
automake.in | 4 +---
bootstrap | 3 +--
configure.ac | 4 +---
contrib/multilib/multi.m4 | 3 +--
doc/Makefile.am | 3 +--
doc/amhello/Makefile.am | 2 +-
doc/amhello/configure.ac | 2 +-
...
tests/yaccpp.test | 2 +-
tests/yaccvpath.test | 2 +-
tests/yflags.test | 2 +-
tests/yflags2.test | 2 +-
1041 files changed, 1041 insertions(+), 1266 deletions(-)
diff --git a/ChangeLog.00 b/ChangeLog.00
index 756107d..c50c4eb 100644
--- a/ChangeLog.00
+++ b/ChangeLog.00
@@ -2205,7 +2205,7 @@
-----
-Copyright 1999, 2000 Free Software Foundation, Inc.
+Copyright 1999-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.01 b/ChangeLog.01
index d3150b2..41fa1e5 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -4931,7 +4931,7 @@
-----
-Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.02 b/ChangeLog.02
index 7e5caa7..a68b644 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -3219,7 +3219,7 @@
-----
-Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.03 b/ChangeLog.03
index 0152d56..b7e8c6a 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -2965,7 +2965,7 @@
-----
-Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 2003-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.04 b/ChangeLog.04
index 5dfcd9e..ad11ecf 100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@ -1613,7 +1613,7 @@
-----
-Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2004-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.09 b/ChangeLog.09
index 063c06b..4e1e56e 100644
--- a/ChangeLog.09
+++ b/ChangeLog.09
@@ -5514,7 +5514,7 @@
-----
-Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.11 b/ChangeLog.11
index 234bf2f..00af8ea 100644
--- a/ChangeLog.11
+++ b/ChangeLog.11
@@ -4700,7 +4700,7 @@
-----
-Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 2010-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.96 b/ChangeLog.96
index 07f71c2..faba801 100644
--- a/ChangeLog.96
+++ b/ChangeLog.96
@@ -3679,7 +3679,7 @@ Mon Sep 19 23:39:21 1994 djm <djm@cambric>
-----
-Copyright 1994, 1995, 1996 Free Software Foundation, Inc.
+Copyright 1994-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.98 b/ChangeLog.98
index 1fcc56c..baad7e2 100644
--- a/ChangeLog.98
+++ b/ChangeLog.98
@@ -2185,7 +2185,7 @@ Thu Jan 2 14:16:17 1997 Tom Tromey <tro...@cygnus.com>
-----
-Copyright 1997, 1998 Free Software Foundation, Inc.
+Copyright 1997-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/HACKING b/HACKING
index 26f1d91..8bd97e7 100644
--- a/HACKING
+++ b/HACKING
@@ -234,8 +234,7 @@
-----
-Copyright (C) 2003, 2007, 2008, 2010, 2011, 2012 Free Software
-Foundation, Inc.
+Copyright (C) 2003-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
diff --git a/Makefile.am b/Makefile.am
index 76c3e69..544c1ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,7 @@
## Makefile for Automake.
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-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
diff --git a/NEWS b/NEWS
index eb9af22..15c9886 100644
--- a/NEWS
+++ b/NEWS
@@ -1679,9 +1679,7 @@ New in 0.20:
-----
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-Foundation, Inc.
+Copyright (C) 1995-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
diff --git a/README b/README
index 3f2414f..0396ff3 100644
--- a/README
+++ b/README
@@ -51,8 +51,7 @@ be informed, subscribe to that list by following the
instructions at
-----
-Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2003, 2008, 2009, 2011
- Free Software Foundation, Inc.
+Copyright (C) 1994-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
diff --git a/TODO b/TODO
index 79f298f..8ad887f 100644
--- a/TODO
+++ b/TODO
@@ -560,8 +560,7 @@ that aren't mentioned?
* copyright notice
-Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2007 Free Software Foundation, Inc.
+Copyright 1994-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
diff --git a/aclocal.in b/aclocal.in
index ed1d8d9..c387000 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -7,9 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S
"$0" "$@";; esac'
# aclocal - create aclocal.m4 by scanning configure.ac
-# 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 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 --git a/automake.in b/automake.in
index cdbb820..18ba2d9 100644
--- a/automake.in
+++ b/automake.in
@@ -6,9 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S
"$0" "$@";; esac'
if 0;
# automake - create Makefile.in from Makefile.am
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1994-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
diff --git a/bootstrap b/bootstrap
index c0043a3..1f263eb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,8 +2,7 @@
# This script helps bootstrap automake, when checked out from git.
#
-# Copyright (C) 2002, 2003, 2004, 2007, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# Originally written by Pavel Roskin <pro...@gnu.org> September 2002.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/configure.ac b/configure.ac
index 18dbd8a..ce0fe63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,6 @@
# Process this file with autoconf to produce a configure script.
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-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
diff --git a/contrib/multilib/multi.m4 b/contrib/multilib/multi.m4
index 9841767..d1320d6 100644
--- a/contrib/multilib/multi.m4
+++ b/contrib/multilib/multi.m4
@@ -1,6 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 655673b..e9d0955 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,8 +2,7 @@
## Makefile for Automake.
-# Copyright (C) 2003, 2006, 2008, 2009, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-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
diff --git a/doc/amhello/Makefile.am b/doc/amhello/Makefile.am
index 469aeb9..8d230a8 100644
--- a/doc/amhello/Makefile.am
+++ b/doc/amhello/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
# This Makefile.am is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/configure.ac b/doc/amhello/configure.ac
index cd378cb..6d966a2 100644
--- a/doc/amhello/configure.ac
+++ b/doc/amhello/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
# This configure.ac script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/src/Makefile.am b/doc/amhello/src/Makefile.am
index 9642aa0..9e17883 100644
--- a/doc/amhello/src/Makefile.am
+++ b/doc/amhello/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
# This Makefile.am is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/src/main.c b/doc/amhello/src/main.c
index 8b1ccf2..c782738 100644
--- a/doc/amhello/src/main.c
+++ b/doc/amhello/src/main.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2012 Free Software Foundation, Inc.
This program is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it. */
diff --git a/doc/automake.texi b/doc/automake.texi
index fb0e5e7..ba5c902 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -23,9 +23,7 @@
@value{UPDATED}), a program that creates GNU standards-compliant
Makefiles from template files.
-Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-Foundation, Inc.
+Copyright @copyright{} 1995-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 8805f1a..38bfdd2 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -5,7 +5,7 @@
@c hence no sectioning command or @node.
@display
-Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation,
Inc.
+Copyright @copyright{} 2000-2012 Free Software Foundation, Inc.
@uref{http://fsf.org/}
Everyone is permitted to copy and distribute verbatim copies
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index aaca979..3cefc44 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2002, 2003, 2006, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-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
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 9a2732c..654a1dd 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2002, 2004, 2006, 2008, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-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
