Mercurial > hg > octave-kai > gnulib-hg
changeset 5606:3a8740615faf
* MODULES.html.sh (Command-line arguments): Add version-etc-fsf.
* modules/version-etc-fsf: New file.
* lib/version-etc-fsf.c: New file, with version_etc_copyright.
* lib/version-etc.c: Remove version_etc_copyright.
* lib/version-etc.h (version_etc_copyright): Use [] instead of * in
prototype.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Fri, 21 Jan 2005 00:24:52 +0000 |
parents | 2b5872ebae54 |
children | 96315b5dbfed |
files | ChangeLog MODULES.html.sh lib/ChangeLog lib/version-etc-fsf.c lib/version-etc.c lib/version-etc.h modules/version-etc-fsf |
diffstat | 7 files changed, 70 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-20 Paul Eggert <eggert@cs.ucla.edu> + + * MODULES.html.sh (Command-line arguments): Add version-etc-fsf. + +2005-01-20 Simon Josefsson <jas@extundo.com> + + * modules/version-etc-fsf: New file. + 2005-01-19 Paul Eggert <eggert@cs.ucla.edu> * modules/mempcpy (Makefile.am): Remove mention of mempcpy.h;
--- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1584,6 +1584,7 @@ func_begin_table func_module argmatch func_module version-etc + func_module version-etc-fsf func_module long-options func_end_table
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2005-01-20 Simon Josefsson <jas@extundo.com> + + * version-etc-fsf.c: New file, with version_etc_copyright. + * version-etc.c: Remove version_etc_copyright. + * version-etc.h (version_etc_copyright): Use [] instead of * in + prototype, suggested by Paul Eggert <eggert@CS.UCLA.EDU>. + 2005-01-20 Paul Eggert <eggert@cs.ucla.edu> * save-cwd.c (save_cwd): Remove code to support the case
new file mode 100644 --- /dev/null +++ b/lib/version-etc-fsf.c @@ -0,0 +1,31 @@ +/* Variable with FSF copyright information, for version-etc. + Copyright (C) 1999-2005 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Written by Jim Meyering. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + +/* Specification. */ +#include "version-etc.h" + +/* Default copyright goes to the FSF. */ + +const char version_etc_copyright[] = + /* Do *not* mark this string for translation. */ + "Copyright (C) 2005 Free Software Foundation, Inc.";
--- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -35,13 +35,6 @@ #include "gettext.h" #define _(msgid) gettext (msgid) -/* Default copyright goes to the FSF. */ - -const char* version_etc_copyright = - /* Do *not* mark this string for translation. */ - "Copyright (C) 2005 Free Software Foundation, Inc."; - - /* Like version_etc, below, but with the NULL-terminated author list provided via a variable of type va_list. */ void
--- a/lib/version-etc.h +++ b/lib/version-etc.h @@ -1,5 +1,5 @@ /* Utility to help print --version output in a consistent format. - Copyright (C) 1999, 2003 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2005 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 @@ -23,7 +23,7 @@ # include <stdarg.h> # include <stdio.h> -extern const char *version_etc_copyright; +extern const char version_etc_copyright[]; extern void version_etc_va (FILE *stream, const char *command_name, const char *package,
new file mode 100644 --- /dev/null +++ b/modules/version-etc-fsf @@ -0,0 +1,21 @@ +Description: +Copyright variable for FSF projects + +Files: +lib/version-etc-fsf.c + +Depends-on: +version-etc + +configure.ac: + +Makefile.am: +lib_SOURCES += version-etc-fsf.c + +Include: + +License: +GPL + +Maintainer: +Jim Meyering