update-copyright copyright notice corruption bug

[Joseph S. Myers]

A second check of the automatic copyright updates for glibc showed that 
update-copyright had corrupted some of the copyright notices.  I've 
applied this glibc patch to fix that corruption.  bug-gnulib: see 
attachment for a testcase.  Run update-copyright as:

UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=2 
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79 update-copyright ctty-input.c

diff --git a/ChangeLog b/ChangeLog
index 1fa5755..12989a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2013-01-02  Joseph Myers  <address@hidden>
 
+       * hurd/ctty-input.c: Fix copyright notice formatting.
+       * hurd/ctty-output.c: Likewise.
+       * hurd/dtable.c: Likewise.
+       * hurd/hurd-raise.c: Likewise.
+       * hurd/hurdprio.c: Likewise.
+       * hurd/msgportdemux.c: Likewise.
+       * misc/sys/file.h: Likewise.
+       * misc/sys/ioctl.h: Likewise.
+       * sysdeps/gnu/netinet/ip_icmp.h: Likewise.
+       * sysdeps/mach/hurd/chdir.c: Likewise.
+       * sysdeps/mach/hurd/fchdir.c: Likewise.
+       * sysdeps/mach/hurd/rename.c: Likewise.
+       * sysdeps/mach/hurd/rmdir.c: Likewise.
+       * sysdeps/mach/hurd/seekdir.c: Likewise.
+       * sysdeps/mach/hurd/setsid.c: Likewise.
+       * sysdeps/posix/wait3.c: Likewise.
+
        * All files with FSF copyright notices: Update copyright dates
        using scripts/update-copyrights.
        * intl/plural.c: Regenerated.
diff --git a/hurd/ctty-input.c b/hurd/ctty-input.c
index 3fb10d2..4c22987 100644
--- a/hurd/ctty-input.c
+++ b/hurd/ctty-input.c
@@ -1,5 +1,5 @@
 /* _hurd_ctty_input -- Do an input RPC and generate SIGTTIN if necessary.
-   Copyright (C) 11999, 20135, 1997-1999 Free Software Foundation, Inc.
+   Copyright (C) 1995-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/hurd/ctty-output.c b/hurd/ctty-output.c
index a231f5e..387befb 100644
--- a/hurd/ctty-output.c
+++ b/hurd/ctty-output.c
@@ -1,5 +1,5 @@
 /* _hurd_ctty_output -- Do an output RPC and generate SIGTTOU if necessary.
-   Copyright (C) 11999, 20135, 1997-1999 Free Software Foundation, Inc.
+   Copyright (C) 1995-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/hurd/dtable.c b/hurd/dtable.c
index 52bcfd0..592dc2c 100644
--- a/hurd/dtable.c
+++ b/hurd/dtable.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/hurd/hurd-raise.c b/hurd/hurd-raise.c
index 80509ff..173a76f 100644
--- a/hurd/hurd-raise.c
+++ b/hurd/hurd-raise.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20134, 1995-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/hurd/hurdprio.c b/hurd/hurdprio.c
index 83aff4f..2f6af72 100644
--- a/hurd/hurdprio.c
+++ b/hurd/hurdprio.c
@@ -1,5 +1,5 @@
 /* Support code for dealing with priorities in the Hurd.
-   Copyright (C) 11999, 20134, 1995-1999 Free Software Foundation, Inc.
+   Copyright (C) 1994-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/hurd/msgportdemux.c b/hurd/msgportdemux.c
index 22c3ebe..dde16b2 100644
--- a/hurd/msgportdemux.c
+++ b/hurd/msgportdemux.c
@@ -1,5 +1,5 @@
 /* Demux messages sent on the signal port.
-   Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+   Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/misc/sys/file.h b/misc/sys/file.h
index cac9a96..64e8764 100644
--- a/misc/sys/file.h
+++ b/misc/sys/file.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/misc/sys/ioctl.h b/misc/sys/ioctl.h
index 5a2badc..2dfff08 100644
--- a/misc/sys/ioctl.h
+++ b/misc/sys/ioctl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 8132825..fcefcf7 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,5 +1,7 @@
 2013-01-02  Joseph Myers  <address@hidden>
 
+       * sysdeps/alpha/Makefile: Fix copyright notice formatting.
+
        * All files with FSF copyright notices: Update copyright dates
        using scripts/update-copyrights.
 
diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 66ac79a..5775d2b 100644
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,5 +1,8 @@
 2013-01-02  Joseph Myers  <address@hidden>
 
+       * sysdeps/m68k/m680x0/fpu/mathimpl.h: Fix copyright notice
+       formatting.
+
        * All files with FSF copyright notices: Update copyright dates
        using scripts/update-copyrights.
 
diff --git a/ports/sysdeps/alpha/Makefile b/ports/sysdeps/alpha/Makefile
index fc59e2f..30e8fd8 100644
--- a/ports/sysdeps/alpha/Makefile
+++ b/ports/sysdeps/alpha/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 11999, 20133, 1994-1999 Free Software Foundation, Inc.
+# Copyright (C) 1993-2013 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Brendan Kehoe (address@hidden).
 
diff --git a/ports/sysdeps/m68k/m680x0/fpu/mathimpl.h 
b/ports/sysdeps/m68k/m680x0/fpu/mathimpl.h
index c5b3933..436e587 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/mathimpl.h
+++ b/ports/sysdeps/m68k/m680x0/fpu/mathimpl.h
@@ -1,6 +1,6 @@
 /* Definitions of libc internal inline math functions implemented
    by the m68881/2.
-   Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+   Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/gnu/netinet/ip_icmp.h b/sysdeps/gnu/netinet/ip_icmp.h
index ca3cf78..136fb47 100644
--- a/sysdeps/gnu/netinet/ip_icmp.h
+++ b/sysdeps/gnu/netinet/ip_icmp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/mach/hurd/chdir.c b/sysdeps/mach/hurd/chdir.c
index 6f5a952..07657a3 100644
--- a/sysdeps/mach/hurd/chdir.c
+++ b/sysdeps/mach/hurd/chdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/mach/hurd/fchdir.c b/sysdeps/mach/hurd/fchdir.c
index 4a94697..bd1f5b3 100644
--- a/sysdeps/mach/hurd/fchdir.c
+++ b/sysdeps/mach/hurd/fchdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/mach/hurd/rename.c b/sysdeps/mach/hurd/rename.c
index 2dfaac6..c30173f 100644
--- a/sysdeps/mach/hurd/rename.c
+++ b/sysdeps/mach/hurd/rename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/mach/hurd/rmdir.c b/sysdeps/mach/hurd/rmdir.c
index 732e31a..d171057 100644
--- a/sysdeps/mach/hurd/rmdir.c
+++ b/sysdeps/mach/hurd/rmdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20131, 1992-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/mach/hurd/seekdir.c b/sysdeps/mach/hurd/seekdir.c
index 7235c6c..6efdf22 100644
--- a/sysdeps/mach/hurd/seekdir.c
+++ b/sysdeps/mach/hurd/seekdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20133, 1994-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/mach/hurd/setsid.c b/sysdeps/mach/hurd/setsid.c
index 27fae88..bce1935 100644
--- a/sysdeps/mach/hurd/setsid.c
+++ b/sysdeps/mach/hurd/setsid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20133, 1994-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/posix/wait3.c b/sysdeps/posix/wait3.c
index 24209f7..5d3f7fb 100644
--- a/sysdeps/posix/wait3.c
+++ b/sysdeps/posix/wait3.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 11999, 20132, 1993-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or

-- 
Joseph S. Myers
address@hidden

ctty-input.c
Description: Text Data