Re: copyright years: mass-update every January 1

[Jim Meyering]

Joel E. Denny wrote:

> On Wed, 29 Jul 2009, Jim Meyering wrote:
>
>> Joel E. Denny wrote:
>
>> > I'd like to use this in Bison.  Would you consider contributing
>> > build-aux/update-copyright to gnulib so we don't maintain separate copies?
>>
>> Sure.
>
> Thanks.  I'll watch for that.  In the meantime, I'll probably import a
> copy into Bison.
>
>> First, here's a change to catch the extra cases you noted,
>> but without concatenating lines.
>
>> diff --git a/build-aux/update-copyright b/build-aux/update-copyright
>> index 42579c2..9039b7c 100755
>> --- a/build-aux/update-copyright
>> +++ b/build-aux/update-copyright
>> @@ -1,7 +1,7 @@
>> -#!/usr/bin/perl -w -pi
>> +#!/usr/bin/perl -0777 -pi
>
> You're still missing copyrights containing newline followed by a comment
> sequence.  For example, m4/lib-check.m4.

You're right.  Thanks.
This new version catches those, too.
It doesn't allow trailing blanks between the final number
and "\n#", but that's not a possibility here.

>From e40c5f735cb1abf6f7b2b0a8a6988c709f698f1d Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 29 Jul 2009 15:39:20 +0200
Subject: [PATCH] maint: make update-copyright work in yet another case

* build-aux/update-copyright: Handle the case in which "\n#"
appears between the final year number and the copyright holder name.
* m4/lib-check.m4: Update copyright year list.
Reported by Joel E. Denny.
---
 THANKS                     |    1 +
 build-aux/update-copyright |    4 ++--
 m4/lib-check.m4            |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/THANKS b/THANKS
index 9115528..d3541ce 100644
--- a/THANKS
+++ b/THANKS
@@ -277,6 +277,7 @@ Jim Dennis                          address@hidden
 Joakim Rosqvist                     address@hidden
 Jochen Hein                         address@hidden
 Joe Orton                           address@hidden
+Joel E. Denny                       address@hidden
 Joerg Sonnenberger                  address@hidden
 Joey Hess                           address@hidden
 Johan Boule                         address@hidden
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index 23d8f38..1ceaf8a 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -0777 -pi
 # Update an FSF copyright year list to include the current year.

-my $VERSION = '2009-07-29.08:43'; # UTC
+my $VERSION = '2009-07-29.13:34'; # UTC

 # Copyright (C) 2009 Free Software Foundation
 #
@@ -27,7 +27,7 @@ my ($sec, $min, $hour, $mday, $month, $year) = localtime 
(time());
 my $this_year = $year + 1900;
 my $holder = 'Free Software Foundation';

-if (/([- ])((?:\d\d)?\d\d)(\s+$holder)/s)
+if (/([- ])((?:\d\d)?\d\d)((?:\n\#)?\s+$holder)/s)
   {
     my ($sep, $last_c_year, $rest) = ($1, $2, $3);

diff --git a/m4/lib-check.m4 b/m4/lib-check.m4
index b2d8d96..952101b 100644
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -2,7 +2,7 @@

 dnl Misc lib-related macros for coreutils.

-# Copyright (C) 1993-1997, 2000-2001, 2003-2006, 2008
+# Copyright (C) 1993-1997, 2000-2001, 2003-2006, 2008-2009
 # Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
--
1.6.4.rc3.201.gd9d59