diff --git a/ChangeLog b/ChangeLog index 233a2ee..c4919c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-05-11 Paolo Bonzini + + * configure.ac: Define COPYRIGHT_YEAR. + * Makefile.am (dist-hook): Test it. + * sed/mbcs.c: Fix copyright years. + * sed/sed.c: Fix copyright years. Change COPYRIGHT_NOTICE to + COPYRIGHT_YEAR. + * sed/utils.c: Fix copyright years. + * testsuite/version.gin: Use COPYRIGHT_YEAR. + 2009-04-30 Paolo Bonzini * sed/compile.c: Declare bool arguments as int instead to please AIX XLC. diff --git a/Makefile.am b/Makefile.am index c1e6a29..178a6cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,8 @@ DISTCHECK_CONFIGURE_FLAGS = XGETTEXT='$(SHELL) -c : dummy' $(EXTRA_DC_FLAGS) EXTRA_DC_FLAGS = dist-hook: + test $(COPYRIGHT_YEAR) = `date +%Y` || \ + { echo Copyright year not updated; exit 1; } cmp bootstrap.sh $(srcdir)/bootstrap.sh > /dev/null 2>&1 || \ cp -p bootstrap.sh $(srcdir)/bootstrap.sh cp -p $(srcdir)/bootstrap.sh $(distdir)/bootstrap.sh diff --git a/configure.ac b/configure.ac index ed5a728..0274f1f 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,11 @@ AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", [Define to the version of GNU sed whose features are supported by this sed.]) AC_SUBST(SED_FEATURE_VERSION) +COPYRIGHT_YEAR=2009 +AC_DEFINE_UNQUOTED(COPYRIGHT_YEAR, $COPYRIGHT_YEAR, + [Define to the copyright year printed by --version.]) +AC_SUBST(COPYRIGHT_YEAR) + AC_PROG_CC gl_EARLY gl_INIT diff --git a/sed/mbcs.c b/sed/mbcs.c index 5669ad1..5746fd5 100644 --- a/sed/mbcs.c +++ b/sed/mbcs.c @@ -1,5 +1,5 @@ /* GNU SED, a batch stream editor. - Copyright (C) 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2006, 2009 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/sed/sed.c b/sed/sed.c index bab2296..d9a238f 100644 --- a/sed/sed.c +++ b/sed/sed.c @@ -1,7 +1,5 @@ -#define COPYRIGHT_NOTICE "Copyright (C) 2003 Free Software Foundation, Inc." - /* GNU SED, a batch stream editor. - Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003 + Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003,2006,2008,2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -319,11 +317,11 @@ main(argc, argv) #else fprintf(stdout, _("GNU sed version %s\n"), VERSION); #endif - fprintf(stdout, _("%s\n\ + fprintf(stdout, _("Copyright (C) %d Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n\ to the extent permitted by law.\n\ -"), COPYRIGHT_NOTICE); +"), COPYRIGHT_YEAR); fputc('\n', stdout); contact(false); diff --git a/sed/utils.c b/sed/utils.c index 87ea101..bf6c6f9 100644 --- a/sed/utils.c +++ b/sed/utils.c @@ -1,5 +1,5 @@ /* Functions from hack's utils library. - Copyright (C) 1989, 1990, 1991, 1998, 1999, 2003, 2008 + Copyright (C) 1989, 1990, 1991, 1998, 1999, 2003, 2008, 2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/testsuite/version.gin b/testsuite/version.gin index be02cd0..10da5e8 100644 --- a/testsuite/version.gin +++ b/testsuite/version.gin @@ -1,5 +1,5 @@ GNU sed version @VERSION@ -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) @COPYRIGHT_YEAR@ Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, to the extent permitted by law.