From 50ee35c903cdecf6c643d107015125f517620102 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 8 Nov 2010 08:06:15 -0800 Subject: [PATCH] maint: fix copyright dates that were munged by a maintenance script * gunzip.in, gzexe.in, zcat.in, zcmp.in, zdiff.in, zforce.in: * zgrep.in, zless.in, zmore.in, znew.in: A script went awry when updating copyright dates in gzip's shell scripts. It should update comments to look like "# Copyright (C) 2007, 2010 Free Software Foundation, Inc." (with a set of years) and version messages to look like "Copyright (C) 2010 Free Software Foundation, Inc." (with just the most-recent year). Instead, it sometimes ignored one, sometimes the other, and typically put ranges into version messages. Fix all this stuff by hand, using dates that I divined from the change logs (so they're a bit more accurate than script-generated dates). We need to fix the script before it runs in 2011. --- gunzip.in | 2 +- gzexe.in | 2 +- zcat.in | 2 +- zcmp.in | 4 ++-- zdiff.in | 2 +- zforce.in | 4 ++-- zgrep.in | 6 ++++-- zless.in | 2 +- zmore.in | 4 ++-- znew.in | 4 ++-- 10 files changed, 17 insertions(+), 15 deletions(-) diff --git a/gunzip.in b/gunzip.in index 64e9764..3cabdad 100644 --- a/gunzip.in +++ b/gunzip.in @@ -24,7 +24,7 @@ esac PATH=$bindir:$PATH version="gunzip (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2007 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/gzexe.in b/gzexe.in index e59b5fc..b4373f5 100644 --- a/gzexe.in +++ b/gzexe.in @@ -36,7 +36,7 @@ nl=' IFS=" $tab$nl" version='gzexe (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2007 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/zcat.in b/zcat.in index 5b3dba1..69cc831 100644 --- a/zcat.in +++ b/zcat.in @@ -24,7 +24,7 @@ esac PATH=$bindir:$PATH version="zcat (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2007 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/zcmp.in b/zcmp.in index c3476cf..7c499f2 100644 --- a/zcmp.in +++ b/zcmp.in @@ -1,7 +1,7 @@ #!/bin/sh # Compare the uncompressed contents of compressed files, byte by byte. -# 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 @@ -24,7 +24,7 @@ esac PATH=$bindir:$PATH version="zcmp (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/zdiff.in b/zdiff.in index 8139738..8eb5715 100644 --- a/zdiff.in +++ b/zdiff.in @@ -31,7 +31,7 @@ case $1 in esac version="z$prog (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/zforce.in b/zforce.in index fdce8b6..89e1486 100644 --- a/zforce.in +++ b/zforce.in @@ -6,7 +6,7 @@ # 12345678901234 is renamed to 12345678901.gz -# Copyright (C) 2002, 2007 Free Software Foundation +# Copyright (C) 2002, 2007, 2010 Free Software Foundation # Copyright (C) 1993 Jean-loup Gailly # This program is free software; you can redistribute it and/or modify @@ -30,7 +30,7 @@ esac PATH=$bindir:$PATH; export PATH version="zforce (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/zgrep.in b/zgrep.in index 6dec3a9..6afa62c 100644 --- a/zgrep.in +++ b/zgrep.in @@ -3,7 +3,9 @@ # zgrep -- a wrapper around a grep program that decompresses files as needed # Adapted from a version sent by Charles Levert -# Copyright (C) 1998, 2001, 2002, 2006, 2007, 2009 Free Software Foundation +# Copyright (C) 1998, 2001, 2002, 2006, 2007, 2009, 2010 Free Software +# Foundation + # Copyright (C) 1993 Jean-loup Gailly # This program is free software; you can redistribute it and/or modify @@ -29,7 +31,7 @@ PATH=$bindir:$PATH grep='${GREP-grep}' version='zgrep (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/zless.in b/zless.in index dbdcfbe..b25e408 100644 --- a/zless.in +++ b/zless.in @@ -23,7 +23,7 @@ esac PATH=$bindir:$PATH; export PATH version="zless (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2007 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/zmore.in b/zmore.in index 547c527..95159bd 100644 --- a/zmore.in +++ b/zmore.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2001, 2002, 2007 Free Software Foundation +# Copyright (C) 2001, 2002, 2007, 2010 Free Software Foundation # Copyright (C) 1992, 1993 Jean-loup Gailly # This program is free software; you can redistribute it and/or modify @@ -24,7 +24,7 @@ esac PATH=$bindir:$PATH; export PATH version="zmore (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/znew.in b/znew.in index 46907d3..d0cb5eb 100644 --- a/znew.in +++ b/znew.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 1998, 2002, 2004, 2007 Free Software Foundation +# Copyright (C) 1998, 2002, 2004, 2007, 2010 Free Software Foundation # Copyright (C) 1993 Jean-loup Gailly # This program is free software; you can redistribute it and/or modify @@ -24,7 +24,7 @@ esac PATH=$bindir:$PATH; export PATH version="znew (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. -- 2.30.2