diff --git a/ChangeLog b/ChangeLog index cbbb5b8..cd9669a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-08-30 Paolo Bonzini + + * Makefile.am (dist-hook): Remove COPYRIGHT_YEAR check. + * autoboot.conf (gnulib_modules): Add version-etc-fsf. + * configure.ac (COPYRIGHT_YEAR): Remove. Change package name to + "GNU sed". + * doc/sed.1: Regenerate. + * sed/sed.c (AUTHORS): New. + (main): Use version_etc. + 2010-07-18 Paolo Bonzini * sed.c (write_mode): New. diff --git a/Makefile.am b/Makefile.am index 178a6cd..c1e6a29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,6 @@ 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/autoboot.conf b/autoboot.conf index 8445276..56f5283 100644 --- a/autoboot.conf +++ b/autoboot.conf @@ -19,9 +19,9 @@ # gnulib modules used by this package. gnulib_modules=" acl alloca btowc c-ctype extensions getline getopt gettext localcharset - mbrlen mbrtowc mbsinit memchr mkostemp obstack pathmax regex rename - selinux-h stdbool stat-macros ssize_t strerror strverscmp unlocked-io - verify wcrtomb wctob" + mbrlen mbrtowc mbsinit memchr mkostemp obstack pathmax regex + rename selinux-h stdbool stat-macros ssize_t strerror strverscmp + unlocked-io verify version-etc-fsf wcrtomb wctob" checkout_only_file= MSGID_BUGS_ADDRESS=bug-gnu-utils@gnu.org diff --git a/configure.ac b/configure.ac index a49c922..5953013 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with -*- autoconf -*- to produce a configure script. -AC_INIT(sed, 4.2.1, bug-gnu-utils@gnu.org, sed) +AC_INIT([GNU sed], 4.2.1, bug-gnu-utils@gnu.org, sed) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) @@ -11,11 +11,6 @@ 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/doc/sed.1 b/doc/sed.1 index 49c267d..688ca2e 100644 --- a/doc/sed.1 +++ b/doc/sed.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. -.TH SED "1" "August 2010" "sed version 4.2.1" "User Commands" +.TH SED "1" "August 2010" "sed 4.2.1" "User Commands" .SH NAME sed \- stream editor for filtering and transforming text .SH SYNOPSIS @@ -367,17 +367,19 @@ E-mail bug reports to Be sure to include the word ``sed'' somewhere in the ``Subject:'' field. Also, please include the output of ``sed --version'' in the body of your report if at all possible. -.SH COPYRIGHT -Copyright \(co 2009 Free Software Foundation, Inc. -.br -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. -.PP +.SH AUTHOR +Written by Jay Fenlason, Tom Lord, Ken Pizzini, +and Paolo Bonzini. GNU sed home page: . General help using GNU software: . E-mail bug reports to: . Be sure to include the word ``sed'' somewhere in the ``Subject:'' field. +.SH COPYRIGHT +Copyright \(co 2010 Free Software Foundation, Inc. +License GPLv3+: GNU GPL version 3 or later . +.br +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. .SH "SEE ALSO" .BR awk (1), .BR ed (1), diff --git a/lib/.gitignore b/lib/.gitignore index 89d3225..e250265 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -9,6 +9,9 @@ basename.c btowc.c c-ctype.c c-ctype.h +c-strcase.h +c-strcasecmp.c +c-strncasecmp.c canonicalize-lgpl.c config.charset copy-acl.c @@ -34,6 +37,19 @@ getpagesize.c gettext.h gettimeofday.c gnulib.mk +iconv.h +iconv.in.h +iconv_open-aix.gperf +iconv_open-aix.h +iconv_open-hpux.gperf +iconv_open-hpux.h +iconv_open-irix.gperf +iconv_open-irix.h +iconv_open-osf.gperf +iconv_open-osf.h +iconv_open-solaris.gperf +iconv_open-solaris.h +iconv_open.c intprops.h langinfo.h langinfo.in.h @@ -44,9 +60,15 @@ malloc.c malloca.c malloca.h malloca.valgrind +mbchar.c +mbchar.h +mbiter.h mbrlen.c mbrtowc.c mbsinit.c +mbslen.c +mbsstr.c +mbuiter.h memchr.c memchr.valgrind memcmp.c @@ -56,6 +78,8 @@ nl_langinfo.c obstack.c obstack.h pathmax.h +propername.c +propername.h quote.c quote.h quotearg.c @@ -82,6 +106,8 @@ se-selinux.in.h set-mode-acl.c stat-macros.h stat.c +stdarg.h +stdarg.in.h stdbool.h stdbool.in.h stddef.h @@ -93,13 +119,18 @@ stdio.h stdio.in.h stdlib.h stdlib.in.h +str-kmp.h streq.h strerror.c +striconv.c +striconv.h string.h string.in.h stripslash.c strndup.c strnlen.c +strnlen1.c +strnlen1.h strverscmp.c sys sys_stat.h @@ -110,18 +141,30 @@ tempname.c tempname.h time.h time.in.h +trim.c +trim.h unistd.h unistd.in.h +unitypes.h +unitypes.in.h +uniwidth.h +uniwidth.in.h unlocked-io.h verify.h +version-etc-fsf.c +version-etc.c +version-etc.h wchar.h wchar.in.h wcrtomb.c wctob.c wctype.h wctype.in.h +wcwidth.c xalloc-die.c xalloc.h xmalloc.c +xstriconv.c +xstriconv.h xstrndup.c xstrndup.h diff --git a/m4/.gitignore b/m4/.gitignore index 37a2390..93d1fb4 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -28,6 +28,8 @@ gnulib-common.m4 gnulib-comp.m4 gnulib-tool.m4 iconv.m4 +iconv_h.m4 +iconv_open.m4 include_next.m4 inline.m4 intdiv0.m4 @@ -43,6 +45,7 @@ lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 +libunistring-base.m4 localcharset.m4 locale-fr.m4 locale-ja.m4 @@ -53,9 +56,12 @@ longlong.m4 lstat.m4 malloc.m4 malloca.m4 +mbchar.m4 +mbiter.m4 mbrlen.m4 mbrtowc.m4 mbsinit.m4 +mbslen.m4 mbstate_t.m4 memchr.m4 memcmp.m4 @@ -83,6 +89,7 @@ signed.m4 size_max.m4 ssize_t.m4 stat.m4 +stdarg.m4 stdbool.m4 stddef_h.m4 stdint.m4 @@ -103,6 +110,7 @@ uintmax_t.m4 ulonglong.m4 unistd_h.m4 unlocked-io.m4 +version-etc.m4 visibility.m4 warn-on-use.m4 wchar.m4 @@ -112,6 +120,7 @@ wcrtomb.m4 wctob.m4 wctype.m4 wctype_h.m4 +wcwidth.m4 wint_t.m4 xalloc.m4 xsize.m4 diff --git a/sed/sed.c b/sed/sed.c index 637722d..3fb71a8 100644 --- a/sed/sed.c +++ b/sed/sed.c @@ -56,6 +56,12 @@ # define ATOI(x) strtoul(x, NULL, 0) #endif +#define AUTHORS \ + _("Jay Fenlason"), \ + _("Tom Lord"), \ + _("Ken Pizzini"), \ + _("Paolo Bonzini") + char *program_name; int extended_regexp_flags = 0; @@ -313,20 +319,9 @@ main(argc, argv) break; case 'v': -#ifdef REG_PERL - fprintf(stdout, _("super-sed version %s\n"), VERSION); - fprintf(stdout, _("based on GNU sed version %s\n\n"), SED_FEATURE_VERSION); -#else - fprintf(stdout, _("GNU sed version %s\n"), VERSION); -#endif - 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_YEAR); - fputc('\n', stdout); + version_etc(stdout, program_name, PACKAGE_NAME, VERSION, + AUTHORS, (char *) NULL); contact(false); - ck_fclose (NULL); exit (0); case 'h':