Re: copyright statement

[Jim Meyering]

Eric Blake wrote:
> Simon Josefsson <simon <at> josefsson.org> writes:
>
>> Most likely a problem I introduced at some point which has been
>> cut'n'pasted a few time since then...
>
> Nice catch.
>
>>  build-aux/gnupload          |    4 ++--
>
> This is synced from automake; the fix needs to be pushed upstream to remain
> persistent.
>
>> +++ b/build-aux/gnupload
>> @@ -1,9 +1,9 @@
>>  #!/bin/sh
>>  # Sign files and upload them.
>>
>> -scriptversion=2009-12-21.21; # UTC
>> +scriptversion=2010-01-27.15; # UTC
>>
>> -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation
>> +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software
> Foundation, Inc.
>
> That, and this created a long line.  Wouldn't it be better to rerun the 
> update-
> copyright script, to get nice line wrapping again?
>
>> +++ b/tests/test-arcfour.c
>> @@ -1,5 +1,5 @@
>>  /*
>> - * Copyright (C) 2005 Free Software Foundation
>> + * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
>
> It's kind of late now, but all of these files missed Jim's global 2009 update.
> I guess it's not worth rectifying, though.
>
>> +++ b/tests/test-count-one-bits.c
>> @@ -1,5 +1,5 @@
>>  /*
>> - * Copyright (C) 2007-2009 Free Software Foundation
>> + * Copyright (C) 2007-2009, 2010  Free Software Foundation, Inc.
>
> Another reason to run the update-copyright script - this should either be:
> 2007, 2008, 2009, 2010
> or:
> 2007-2010
> but not the hybrid mix.

I've changed the hybrids to be a simple range:

git grep -l -E '[0-9]{4}   *Free Software F' \
  | xargs perl -pi -e 's/-2009, 2010 +(Free Software)/-2010 $1/'

And also changed the two spaces before "Free Software..." to one:

grep -l -E '[0-9]{4}   *Free Software F' \
  | xargs perl -pi -e 's/  +(Free Software)/ $1/'


commit 7780e43404199735fef99233a69c85c5b3c20e78
Author: Jim Meyering <address@hidden>
Date:   Wed Jan 27 16:53:28 2010 +0100

    maint: normalize copyright notices

    Change some mixed copyright year ranges, like "2007-2009, 2010"
    to the more concise range, "2007-2010"

      git grep -l -E '[0-9]{4}   *Free Software' \
        | xargs perl -pi -e 's/-2009, 2010 +(Free Software)/-2010 $1/'

    And also change the two spaces before "Free Software..." to one:

      grep -l -E '[0-9]{4}   *Free Software' \
        | xargs perl -pi -e 's/  +(Free Software)/ $1/'

diff --git a/tests/test-count-one-bits.c b/tests/test-count-one-bits.c
index e1c2429..ad811ac 100644
--- a/tests/test-count-one-bits.c
+++ b/tests/test-count-one-bits.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2007-2010 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/tests/test-memchr.c b/tests/test-memchr.c
index f08c65c..a801614 100644
--- a/tests/test-memchr.c
+++ b/tests/test-memchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2008-2010 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-memchr2.c b/tests/test-memchr2.c
index 0bde545..bb81c0b 100644
--- a/tests/test-memchr2.c
+++ b/tests/test-memchr2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2008-2010 Free Software Foundation, Inc.
  * Written by Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-memcmp.c b/tests/test-memcmp.c
index 6ba5a31..28b8274 100644
--- a/tests/test-memcmp.c
+++ b/tests/test-memcmp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2008-2010 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-memmem.c b/tests/test-memmem.c
index 6740460..a9d3558 100644
--- a/tests/test-memmem.c
+++ b/tests/test-memmem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2007-2010 Free Software Foundation, Inc.
  * Written by Bruno Haible and Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-memrchr.c b/tests/test-memrchr.c
index dbcb899..8200244 100644
--- a/tests/test-memrchr.c
+++ b/tests/test-memrchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2008-2010 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify