On 02/03/13 02:19, Richard Sandiford wrote: > Not exactly the most exciting patches, and certainly not worth more than > one ping, but: > > fixincludes copyright > http://gcc.gnu.org/ml/gcc-patches/2013-01/msg00442.html
You missed the file header. Why bother with dual update issues? > --- mkheaders.in (revision 194742) > > +++ mkheaders.in (working copy) > > @@ -1,6 +1,6 @@ > > #!/bin/sh > > > > -# Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc. > > +# GCC Copyright (C) 2002-2013 Free Software Foundation, Inc. > > > > #This file is part of GCC. > > > > @@ -41,10 +41,9 @@ > > > > if [ x$1 = x--version ] ; then > > echo "mkheaders (GCC) version $version" > > - echo "Copyright 2002, 2007, 2009 Free Software Foundation, Inc." > > - echo "This program is free software; you may redistribute it under the" > > - echo "terms of the GNU General Public License. This program has" > > - echo "absolutely no warranty." > > + sed '\@http://www.gnu.org/licenses@q > > + \@/bin/sh@d > > + s/^#* *//' `which $0` > > exit 0 > > fi Alternatively (and probably better): > --- mkheaders.in (revision 194742) > +++ mkheaders.in (working copy) > @@ -1,22 +1,22 @@ > #!/bin/sh > +copyright=' > +GCC Copyright (C) 2002-2013 Free Software Foundation, Inc. > > -# Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc. > +This file is part of GCC. > > -#This file is part of GCC. > - > -#GCC is free software; you can redistribute it and/or modify it under > -#the terms of the GNU General Public License as published by the Free > -#Software Foundation; either version 3, or (at your option) any later > -#version. > - > -#GCC is distributed in the hope that it will be useful, but WITHOUT > -#ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > -#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License > -#for more details. > - > -#You should have received a copy of the GNU General Public License > -#along with GCC; see the file COPYING3. If not see > -#<http://www.gnu.org/licenses/>. > +GCC is free software; you can redistribute it and/or modify it under > +the terms of the GNU General Public License as published by the Free > +Software Foundation; either version 3, or (at your option) any later > +version. > + > +GCC is distributed in the hope that it will be useful, but WITHOUT > +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License > +for more details. > + > +You should have received a copy of the GNU General Public License > +along with GCC; see the file COPYING3. If not see > +<http://www.gnu.org/licenses/>.' > > # Basic information > target=@target@ > @@ -41,10 +41,7 @@ > > if [ x$1 = x--version ] ; then > echo "mkheaders (GCC) version $version" > - echo "Copyright 2002, 2007, 2009 Free Software Foundation, Inc." > - echo "This program is free software; you may redistribute it under the" > - echo "terms of the GNU General Public License. This program has" > - echo "absolutely no warranty." > + echo "$copyright" > exit 0 > fi > Either way.... =========================================================== > http://gcc.gnu.org/ml/gcc-patches/2013-01/msg00443.html Is the project fixincludes, inclhack, gcc or unnamed? I think if you go to the trouble to clean all this up, one should be picked and it should be made consistent. :) Personally, I think "GCC" first, "fixincludes" second. > Index: gcc/fixincludes/fixinc.in > =================================================================== > --- gcc.orig/fixincludes/fixinc.in > +++ gcc/fixincludes/fixinc.in > @@ -6,8 +6,7 @@ > # > # See README-fixinc for more information. > # > -# fixincludes copyright (c) 1998, 1999, 2000, 2002, 2009 > -# The Free Software Foundation, Inc. > +# fixincludes copyright (C) 1998-2013 Free Software Foundation, Inc. > # > # fixincludes is free software. > # > Index: gcc/fixincludes/fixincl.c > =================================================================== > --- gcc.orig/fixincludes/fixincl.c > +++ gcc/fixincludes/fixincl.c > @@ -2,8 +2,7 @@ > files which are fixed to work correctly with ANSI C and placed in a > directory that GCC will search. > > - Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009, 2012 > - Free Software Foundation, Inc. > + Copyright (C) 1997-2013 Free Software Foundation, Inc. > > This file is part of GCC. > > Index: gcc/fixincludes/fixincl.tpl > =================================================================== > --- gcc.orig/fixincludes/fixincl.tpl > +++ gcc/fixincludes/fixincl.tpl > @@ -18,9 +18,7 @@ x=fixincl.x =] > * > * See README for more information. > * > - * inclhack copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, > - * 2006, 2007, 2008 > - * The Free Software Foundation, Inc. > + * inclhack copyright (C) 1998-2013 Free Software Foundation, Inc. > * > * inclhack is free software: you can redistribute it and/or modify it > * under the terms of the GNU General Public License as published by the
