From e40c5f735cb1abf6f7b2b0a8a6988c709f698f1d Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 29 Jul 2009 15:39:20 +0200 Subject: 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 9115528b6..d3541ce81 100644 --- a/THANKS +++ b/THANKS @@ -277,6 +277,7 @@ Jim Dennis jimd@starshine.org Joakim Rosqvist dvljrt@cs.umu.se Jochen Hein jochen@jochen.org Joe Orton joe@manyfish.co.uk +Joel E. Denny jdenny@clemson.edu Joerg Sonnenberger joerg@britannica.bec.de Joey Hess joeyh@debian.org Johan Boule bohan@bohan.dyndns.org diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 23d8f38ca..1ceaf8ab6 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 b2d8d96cc..952101bda 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 -- cgit v1.2.3-70-g09d2