Re: copyright statement

[Jim Meyering]

Jim Meyering wrote:
>
> 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/'

Ha!
Simon beat me to it with the first part, so this makes
only the latter change:

>From fb4a9aa847c5e660adda65e9e2b9752aabfeeaf3 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 27 Jan 2010 17:12:30 +0100
Subject: [PATCH] maint: normalize copyright notices

Normalize some copyright comments: change the two spaces before
"Free Software..." to one:

  git grep -l -E '[0-9]{4}   *Free Software' \
    | xargs perl -pi -e 's/  +(Free Software)/ $1/'
---
 build-aux/compile           |    2 +-
 build-aux/git-version-gen   |    2 +-
 build-aux/gnupload          |    2 +-
 tests/test-arcfour.c        |    2 +-
 tests/test-arctwo.c         |    2 +-
 tests/test-count-one-bits.c |    2 +-
 tests/test-crc.c            |    2 +-
 tests/test-des.c            |    2 +-
 tests/test-gc-arcfour.c     |    2 +-
 tests/test-gc-arctwo.c      |    2 +-
 tests/test-gc-des.c         |    2 +-
 tests/test-gc-hmac-md5.c    |    2 +-
 tests/test-gc-hmac-sha1.c   |    2 +-
 tests/test-gc-md2.c         |    2 +-
 tests/test-gc-md4.c         |    2 +-
 tests/test-gc-md5.c         |    2 +-
 tests/test-gc-pbkdf2-sha1.c |    2 +-
 tests/test-gc-rijndael.c    |    2 +-
 tests/test-gc-sha1.c        |    2 +-
 tests/test-gc.c             |    2 +-
 tests/test-gethostname.c    |    2 +-
 tests/test-gettimeofday.c   |    2 +-
 tests/test-hash.c           |    2 +-
 tests/test-hmac-md5.c       |    2 +-
 tests/test-hmac-sha1.c      |    2 +-
 tests/test-md2.c            |    2 +-
 tests/test-md4.c            |    2 +-
 tests/test-md5.c            |    2 +-
 tests/test-memchr.c         |    2 +-
 tests/test-memchr2.c        |    2 +-
 tests/test-memcmp.c         |    2 +-
 tests/test-memmem.c         |    2 +-
 tests/test-memrchr.c        |    2 +-
 tests/test-rawmemchr.c      |    2 +-
 tests/test-read-file.c      |    2 +-
 tests/test-rijndael.c       |    2 +-
 tests/test-sockets.c        |    2 +-
 tests/test-strchrnul.c      |    2 +-
 tests/test-strstr.c         |    2 +-
 tests/test-strtod.c         |    2 +-
 40 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/build-aux/compile b/build-aux/compile
index c0096a7..fa0bd9d 100755
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -3,7 +3,7 @@

 scriptversion=2009-10-06.20; # UTC

-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
 # Foundation, Inc.
 # Written by Tom Tromey <address@hidden>.
 #
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index d20f41e..5f2f1cc 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -2,7 +2,7 @@
 # Print a version string.
 scriptversion=2010-01-27.16

-# Copyright (C) 2007-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/build-aux/gnupload b/build-aux/gnupload
index fca5c47..4323647 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -3,7 +3,7 @@

 scriptversion=2010-01-27.15; # UTC

-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software 
Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 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-arcfour.c b/tests/test-arcfour.c
index 9acc191..9291f52 100644
--- a/tests/test-arcfour.c
+++ b/tests/test-arcfour.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-arctwo.c b/tests/test-arctwo.c
index ef07f13..e2c8d66 100644
--- a/tests/test-arctwo.c
+++ b/tests/test-arctwo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-count-one-bits.c b/tests/test-count-one-bits.c
index 3147aa4..ad811ac 100644
--- a/tests/test-count-one-bits.c
+++ b/tests/test-count-one-bits.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-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-crc.c b/tests/test-crc.c
index 1c74c2e..19b66da 100644
--- a/tests/test-crc.c
+++ b/tests/test-crc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2006, 2007, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 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-des.c b/tests/test-des.c
index be20be8..94ba0de 100644
--- a/tests/test-des.c
+++ b/tests/test-des.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2007, 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-gc-arcfour.c b/tests/test-gc-arcfour.c
index 30382d8..e84903a 100644
--- a/tests/test-gc-arcfour.c
+++ b/tests/test-gc-arcfour.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc-arctwo.c b/tests/test-gc-arctwo.c
index 9c24e14..e46b38e 100644
--- a/tests/test-gc-arctwo.c
+++ b/tests/test-gc-arctwo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc-des.c b/tests/test-gc-des.c
index 732f434..69b17ac 100644
--- a/tests/test-gc-des.c
+++ b/tests/test-gc-des.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc-hmac-md5.c b/tests/test-gc-hmac-md5.c
index 12bb104..f843eed 100644
--- a/tests/test-gc-hmac-md5.c
+++ b/tests/test-gc-hmac-md5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc-hmac-sha1.c b/tests/test-gc-hmac-sha1.c
index a902605..3da3196 100644
--- a/tests/test-gc-hmac-sha1.c
+++ b/tests/test-gc-hmac-sha1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc-md2.c b/tests/test-gc-md2.c
index 7fff37c..8cb1ffa 100644
--- a/tests/test-gc-md2.c
+++ b/tests/test-gc-md2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc-md4.c b/tests/test-gc-md4.c
index 51d21d9..9d8083a 100644
--- a/tests/test-gc-md4.c
+++ b/tests/test-gc-md4.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc-md5.c b/tests/test-gc-md5.c
index 30b4770..5a12e48 100644
--- a/tests/test-gc-md5.c
+++ b/tests/test-gc-md5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc-pbkdf2-sha1.c b/tests/test-gc-pbkdf2-sha1.c
index b0ef14c..d0e6189 100644
--- a/tests/test-gc-pbkdf2-sha1.c
+++ b/tests/test-gc-pbkdf2-sha1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2010  Free Software Foundation, 
Inc.
+ * Copyright (C) 2002, 2003, 2004, 2005, 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-gc-rijndael.c b/tests/test-gc-rijndael.c
index 01e6915..33981d0 100644
--- a/tests/test-gc-rijndael.c
+++ b/tests/test-gc-rijndael.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc-sha1.c b/tests/test-gc-sha1.c
index 4db5d12..0bdae5e 100644
--- a/tests/test-gc-sha1.c
+++ b/tests/test-gc-sha1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-gc.c b/tests/test-gc.c
index 6a325d1..b5bc27a 100644
--- a/tests/test-gc.c
+++ b/tests/test-gc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2006, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 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-gethostname.c b/tests/test-gethostname.c
index e462f82..c500f41 100644
--- a/tests/test-gethostname.c
+++ b/tests/test-gethostname.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2008, 2009, 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-gettimeofday.c b/tests/test-gettimeofday.c
index b884214..2a07814 100644
--- a/tests/test-gettimeofday.c
+++ b/tests/test-gettimeofday.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
  * Written by Jim Meyering.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-hash.c b/tests/test-hash.c
index 2483351..1715033 100644
--- a/tests/test-hash.c
+++ b/tests/test-hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2009, 2010 Free Software Foundation, Inc.
  * Written by Jim Meyering
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-hmac-md5.c b/tests/test-hmac-md5.c
index 4db9cf7..4b6e43a 100644
--- a/tests/test-hmac-md5.c
+++ b/tests/test-hmac-md5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-hmac-sha1.c b/tests/test-hmac-sha1.c
index 16db99e..536d1e1 100644
--- a/tests/test-hmac-sha1.c
+++ b/tests/test-hmac-sha1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-md2.c b/tests/test-md2.c
index dddc39e..d0c4d4b 100644
--- a/tests/test-md2.c
+++ b/tests/test-md2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-md4.c b/tests/test-md4.c
index 83c7635..9602683 100644
--- a/tests/test-md4.c
+++ b/tests/test-md4.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-md5.c b/tests/test-md5.c
index b1cceb3..2392850 100644
--- a/tests/test-md5.c
+++ b/tests/test-md5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2009, 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-memchr.c b/tests/test-memchr.c
index bfab7b6..a801614 100644
--- a/tests/test-memchr.c
+++ b/tests/test-memchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-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 2eb0fc9..bb81c0b 100644
--- a/tests/test-memchr2.c
+++ b/tests/test-memchr2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-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 13918be..28b8274 100644
--- a/tests/test-memcmp.c
+++ b/tests/test-memcmp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-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 0f22834..a9d3558 100644
--- a/tests/test-memmem.c
+++ b/tests/test-memmem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-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 746603c..8200244 100644
--- a/tests/test-memrchr.c
+++ b/tests/test-memrchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-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-rawmemchr.c b/tests/test-rawmemchr.c
index da09c6d..9476818 100644
--- a/tests/test-rawmemchr.c
+++ b/tests/test-rawmemchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2008, 2009, 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-read-file.c b/tests/test-read-file.c
index 96f3321..0a0bf68 100644
--- a/tests/test-read-file.c
+++ b/tests/test-read-file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2006-2007, 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-rijndael.c b/tests/test-rijndael.c
index a154574..e27a9db 100644
--- a/tests/test-rijndael.c
+++ b/tests/test-rijndael.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2005, 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-sockets.c b/tests/test-sockets.c
index e82cb3a..ab5460a 100644
--- a/tests/test-sockets.c
+++ b/tests/test-sockets.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2008, 2009, 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-strchrnul.c b/tests/test-strchrnul.c
index 0920a5e..49d8278 100644
--- a/tests/test-strchrnul.c
+++ b/tests/test-strchrnul.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2008, 2009, 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-strstr.c b/tests/test-strstr.c
index ce70407..b6845ab 100644
--- a/tests/test-strstr.c
+++ b/tests/test-strstr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2007, 2008, 2009, 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-strtod.c b/tests/test-strtod.c
index 8a79e05..cdb57b2 100644
--- a/tests/test-strtod.c
+++ b/tests/test-strtod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+ * Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
  * Written by Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
--
1.7.0.rc0.140.gfbe7