# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1264608750 -3600
# Node ID f68718212da8b93c31c5b6792faff82e5724b82c
# Parent  8092eca444bb88567cc478dcb45dc903fbc4aaa8
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/'

diff --git a/build-aux/compile b/build-aux/compile
--- 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 <tromey@cygnus.com>.
 #
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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