[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: branch - upgrade to GPLv3+
|
From: |
Eric Blake |
|
Subject: |
Re: branch - upgrade to GPLv3+ |
|
Date: |
Tue, 10 Jul 2007 20:42:14 +0000 (UTC) |
|
User-agent: |
Loom/3.14 (http://gmane.org/) |
Gary V. Vaughan <gary <at> gnu.org> writes:
> > I
> > also need to port this patch to head, but as that is not as close
> > to an
> > eminent release, I'm not quite as worried about the timing.
>
> Thanks for the work.
>
> Please commit changes that are applicable to HEAD and branch_1-4
> simultaneously
> to both branches so that we don't end up losing track of what changes
> are in
> what trees, and potentially having to debug the same problem twice.
Done; porting the patch to head took a bit longer than I had anticipated,
because we pull version-etc.c directly from gnulib rather than using gnulib-
tool, and hence did not benefit from gnulib-tool --local-dir. I've been
meaning to improve that, by having two separate gnulib-based libraries, one for
use in modules, and one for use only by the main program; but have not gotten
around to that. Part of my delay is that I would like to complete the
conversion to git first, since it involves moving files around, which CVS
doesn't handle very well.
I also bumped the branch to report version 1.4.10a, as well as making the
branch documentation History section consistent with this patch.
2007-07-10 Eric Blake <address@hidden>
Upgrade to GPLv3, and document 1.4.10.
* bootstrap: Adjust to GPLv3.
(func_update): Port from branch.
* ltdl/m4/gnulib-cache.m4: Augment with 'gnulib-tool
--local-dir=local --import gpl-3.0'.
* doc/m4.texinfo (History): Mention 1.4.11.
(Copying This Package): New appendix.
* NEWS: Document 1.4.10.
* local/doc/gpl-3.0.texi.diff: New file.
* Makefile.am: Update license.
(doc_m4_TEXINFOS, EXTRA_DIST): Distribute additions.
* commit: Update license.
* configure.ac: Likewise.
* ltdl/config/mailnotify: Likewise.
* ltdl/config/mkstamp: Likewise.
* ltdl/m4/debug.m4: Likewise.
* ltdl/m4/gmp.m4: Likewise.
* ltdl/m4/m4-error.m4: Likewise.
* ltdl/m4/m4-getopt.m4: Likewise.
* ltdl/m4/m4-gettext.m4: Likewise.
* ltdl/m4/m4-obstack.m4: Likewise.
* ltdl/m4/m4-regex.m4: Likewise.
* ltdl/m4/stackovf.m4: Likewise.
* m4/builtin.c: Likewise.
* m4/debug.c: Likewise.
* m4/hash.c: Likewise.
* m4/hash.h: Likewise.
* m4/input.c: Likewise.
* m4/m4.c: Likewise.
* m4/m4module.h: Likewise.
* m4/m4private.h: Likewise.
* m4/macro.c: Likewise.
* m4/module.c: Likewise.
* m4/output.c: Likewise.
* m4/path.c: Likewise.
* m4/resyntax.c: Likewise.
* m4/symtab.c: Likewise.
* m4/syntax.c: Likewise.
* m4/system_.h: Likewise.
* m4/utility.c: Likewise.
* modules/evalparse.c: Likewise.
* modules/format.c: Likewise.
* modules/gnu.c: Likewise.
* modules/import.c: Likewise.
* modules/load.c: Likewise.
* modules/m4.c: Likewise.
* modules/m4.h: Likewise.
* modules/modtest.c: Likewise.
* modules/mpeval.c: Likewise.
* modules/perl.c: Likewise.
* modules/shadow.c: Likewise.
* modules/stdlib.c: Likewise.
* modules/time.c: Likewise.
* modules/traditional.c: Likewise.
* po/Makevars: Likewise.
* src/freeze.c: Likewise.
* src/m4.h: Likewise.
* src/main.c: Likewise.
* src/stackovf.c: Likewise.
* tests/builtins.at: Likewise.
* tests/freeze.at: Likewise.
* tests/generate.awk: Likewise.
* tests/m4.in: Likewise.
* tests/macros.at: Likewise.
* tests/modules.at: Likewise.
* tests/options.at: Likewise.
* tests/others.at: Likewise.
* tests/stackovf.test: Likewise.
* tests/testsuite.at: Likewise.
Index: HACKING
===================================================================
RCS file: /sources/m4/m4/HACKING,v
retrieving revision 1.10
diff -u -p -r1.10 HACKING
--- HACKING 10 Apr 2007 14:39:40 -0000 1.10
+++ HACKING 10 Jul 2007 20:36:48 -0000
@@ -401,14 +401,14 @@ issue.
--
-Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
The canonical source of this file is maintained with the
GNU M4 package. Report bugs to address@hidden
GNU M4 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
+published by the Free Software Foundation; either version 3
of the License, or (at your option) any later version.
GNU M4 is distributed in the hope that it will be useful,
Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile.am
--- Makefile.am 28 May 2007 18:52:41 -0000 1.54
+++ Makefile.am 10 Jul 2007 20:36:48 -0000
@@ -5,7 +5,7 @@
##
## 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 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
@@ -40,7 +40,8 @@ AM_LDFLAGS = -no-undefined -export-dynam
EXTRA_DIST = bootstrap \
$(config_aux_dir)/mkstamp \
- $(config_macro_dir)/gnulib-cache.m4
+ $(config_macro_dir)/gnulib-cache.m4 \
+ local/doc/gpl-3.0.texi.diff
CLEANFILES =
DISTCLEANFILES =
MOSTLYCLEANFILES=
@@ -250,7 +251,7 @@ ltdl/libltdlc.la:
## -------------- ##
info_TEXINFOS = doc/m4.texinfo
-doc_m4_TEXINFOS = doc/regexprops-generic.texi doc/fdl.texi
+doc_m4_TEXINFOS = doc/regexprops-generic.texi doc/fdl.texi doc/gpl-
3.0.texi
dist_man_MANS = doc/m4.1
EXTRA_DIST += $(config_aux_dir)/gendocs.sh doc/gendocs_template
MAINTAINERCLEANFILES += $(config_aux_dir)/gendocs.sh doc/gendocs_template \
Index: NEWS
===================================================================
RCS file: /sources/m4/m4/NEWS,v
retrieving revision 1.43
diff -u -p -r1.43 NEWS
--- NEWS 31 May 2007 13:26:38 -0000 1.43
+++ NEWS 10 Jul 2007 20:36:48 -0000
@@ -201,6 +201,41 @@ promoted to 2.0.
*** Improvements made in the 1.4.x stable series have been incorporated.
+* Version 1.4.10 - 09 Jul 2007, by Eric Blake (CVS version 1.4.9c)
+
+** Upgrade from GPL version 2 to GPL version 3 or later.
+
+** A number of portability improvements inherited from gnulib.
+
+** Avoid undefined behavior introduced in 1.4.9b in the `format' builtin
+ when handling %c. However, this area of code has never been documented,
+ and currently does not match the POSIX behavior of printf(1), so it may
+ have further changes in the next version.
+
+* Version 1.4.9b - 29 May 2007, by Eric Blake (CVS version 1.4.9a)
+
+** Fix regression introduced in 1.4.9 in the `eval' builtin when performing
+ division.
+
+** Fix regression introduced in 1.4.8 in the `-F' option that made it
+ impossible to freeze more than 512 kibibytes of diverted text.
+
+** The synclines option `-s' no longer generates sync lines in the middle of
+ multiline comments or quoted strings.
+
+** Work around a number of corner-case POSIX compliance bugs in various
+ broken stdio libraries. In particular, the `syscmd' builtin behaves
+ more predictably when stdin is seekable.
+
+** The `format' builtin now understands formats such as %a, %A, and %'hhd,
+ and works around a number of platform printf bugs. Furthermore, the
+ sequence format(%*.*d,-1,-1,1) no longer outputs random data. However,
+ some non-compliant platforms such as mingw still have known bugs in
+ strtod that may cause testsuite failures.
+
+** The testsuite is improved to also run gnulib portability tests for the
+ features that M4 imports from gnulib.
+
* Version 1.4.9 - 23 Mar 2007, by Eric Blake (CVS version 1.4.8c)
** Minor documentation and portability cleanups.
Index: bootstrap
===================================================================
RCS file: /sources/m4/m4/bootstrap,v
retrieving revision 1.46
diff -u -p -r1.46 bootstrap
--- bootstrap 1 Jul 2007 19:49:41 -0000 1.46
+++ bootstrap 10 Jul 2007 20:36:48 -0000
@@ -1,6 +1,6 @@
#! /bin/sh
-# bootstrap (GNU M4) version 2007-03-24
+# bootstrap (GNU M4) version 2007-07-10
# Written by Gary V. Vaughan <address@hidden>
# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -9,7 +9,7 @@
# 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -186,6 +186,18 @@ func_version ()
exit $EXIT_SUCCESS
}
+# func_update
+# Copy $1 to $2 if it is newer.
+func_update ()
+{
+ if test -f "$2" && cmp -s "$1" "$2" ; then
+ func_verbose "$2 is up-to-date"
+ else
+ func_echo "copying $1 -> $2"
+ cp "$1" "$2"
+ fi
+}
+
# Parse options once, thoroughly. This comes as soon as possible in
# the script to make things like `commit --version' happen quickly.
{
@@ -456,6 +468,21 @@ func_echo "running: AUTOPOINT=true" \
AUTOPOINT=true $AUTORECONF --force --verbose --install --no-recursive
+## ---------------------------------------- ##
+## Gnulib is more up-to-date than automake. ##
+## ---------------------------------------- ##
+
+func_update "$gnulibdir"/build-aux/config.guess $config_aux_dir/config.guess
+func_update "$gnulibdir"/build-aux/config.sub $config_aux_dir/config.sub
+func_update "$gnulibdir"/build-aux/depcomp $config_aux_dir/depcomp
+func_update "$gnulibdir"/build-aux/install-sh $config_aux_dir/install-sh
+func_update "$gnulibdir"/build-aux/mdate-sh $config_aux_dir/mdate-sh
+func_update "$gnulibdir"/build-aux/missing $config_aux_dir/missing
+func_update "$gnulibdir"/build-aux/texinfo.tex $config_aux_dir/texinfo.tex
+func_update "$gnulibdir"/doc/COPYINGv3 COPYING
+func_update "$gnulibdir"/doc/INSTALL INSTALL
+
+
## ------- ##
## Wrapup. ##
## ------- ##
Index: commit
===================================================================
RCS file: /sources/m4/m4/commit,v
retrieving revision 1.6
diff -u -p -r1.6 commit
--- commit 10 Jun 2006 13:08:39 -0000 1.6
+++ commit 10 Jul 2007 20:36:48 -0000
@@ -4,13 +4,13 @@
# Written by Gary V. Vaughan <address@hidden>
# and Alexandre Oliva <address@hidden>
-# Copyright (C) 1999, 2000, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2004, 2006, 2007 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.
# 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -165,7 +165,7 @@ func_missing_arg ()
func_usage ()
{
$SED '/^# Usage:/,/# -h/ {
- s/^# //; s/^# *$//;
+ s/^# //; s/^# *$//;
s/\$progname/'$progname'/;
p;
}; d' < "$progpath"
@@ -179,7 +179,7 @@ func_usage ()
func_help ()
{
$SED '/^# Usage:/,/# Report bugs to/ {
- s/^# //; s/^# *$//;
+ s/^# //; s/^# *$//;
s/\$progname/'$progname'/;
p;
}; d' < "$progpath"
@@ -191,9 +191,9 @@ func_help ()
func_version ()
{
$SED '/^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //; s/^# *$//;
- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/;
- p;
+ s/^# //; s/^# *$//;
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/;
+ p;
}; d' < "$progpath"
exit $EXIT_SUCCESS
}
@@ -346,10 +346,10 @@ func_version ()
$opt_update && {
func_error "$progname: checking for conflicts..."
if ( $CVS $cvs_flags -q -n update $update_flags ${1+"$@"} |
- while read line; do
+ while read line; do
echo "$line"
echo "$line" >&3
- done | grep '^C'
+ done | grep '^C'
) 3>&1 >/dev/null; then
func_fatal_error "some conflicts were found, aborting..."
fi
@@ -359,8 +359,8 @@ if test -f "$log_file"; then :; else
if test -z "$ChangeLog"; then
for f in ${1+"$@"}; do
case "$f" in
- ChangeLog* | */ChangeLog*)
- if test -z "$ChangeLog"; then
+ ChangeLog* | */ChangeLog*)
+ if test -z "$ChangeLog"; then
ChangeLog="$f"
else
func_fatal_error "multiple ChangeLog files: $ChangeLog and $f"
@@ -375,32 +375,32 @@ if test -f "$log_file"; then :; else
skipping=:
sed 's,^,+,' < ${ChangeLog-ChangeLog} |
while read line; do
- case "$line" in
- "+") if $skipping; then skipping=false; else break; fi;;
- "+ "*)
+ case "$line" in
+ "+") if $skipping; then skipping=false; else break; fi;;
+ "+ "*)
func_error "*** Warning: lines should start with tabs, not spaces;
ignoring line:"
echo "$line" | sed 's/^.//' >&2;;
- "+ "*)
- $skipping || echo "$line" ;;
- esac
+ "+ "*)
+ $skipping || echo "$line" ;;
+ esac
done |
- sed 's,^\+ ,,' > "$log_file" || exit $EXIT_FAILURE
+ sed 's,^\+ ,,' > "$log_file" || exit $EXIT_FAILURE
else
$CVS $cvs_flags diff -u ${ChangeLog-ChangeLog} |
while read line; do
- case $line in
- "--- "*) :;;
- "-"*)
+ case $line in
+ "--- "*) :;;
+ "-"*)
func_error "*** Warning: the following line in ChangeLog diff is
suspicious:"
echo "$line" | sed 's/^.//' >&2;;
- "+ "*)
+ "+ "*)
func_error "*** Warning: lines should start with tabs, not spaces;
ignoring line:"
echo "$line" | sed 's/^.//' >&2;;
- "+") echo ;;
- "+ "*) echo "$line";;
- esac
+ "+") echo ;;
+ "+ "*) echo "$line";;
+ esac
done |
- sed -e 's,\+ ,,' -e '/./p' -e '/./d' -e '1d' -e '$d' > "$log_file" \
+ sed -e 's,\+ ,,' -e '/./p' -e '/./d' -e '1d' -e '$d' > "$log_file" \
|| exit $EXIT_FAILURE
fi
# The sed script above removes "+TAB" from the beginning of a line, then
@@ -436,15 +436,15 @@ if test -n "$sendmail_to"; then
{
test -f CVS/Root &&
- echo "CVSROOT: `sed -e 's,.*:,,g' CVS/Root`"
+ echo "CVSROOT: `sed -e 's,.*:,,g' CVS/Root`"
test -f $MKSTAMP &&
- echo "TIMESTAMP: `$SHELL $MKSTAMP < ./ChangeLog`"
+ echo "TIMESTAMP: `$SHELL $MKSTAMP < ./ChangeLog`"
test -f CVS/Repository &&
- echo "Module name: `cat CVS/Repository`"
+ echo "Module name: `cat CVS/Repository`"
test -f CVS/Tag &&
- echo "Branch: `sed -e 's,^T,,;1q' CVS/Tag`"
+ echo "Branch: `sed -e 's,^T,,;1q' CVS/Tag`"
test -f CVS/Root &&
- echo "Changes by: `sed -e 's,:.*$,,g;s,^.*:,,' CVS/Root`"
+ echo "Changes by: `sed -e 's,:.*$,,g;s,^.*:,,' CVS/Root`"
echo ""
echo "Log Message:"
sed -e 's,^, ,' "$log_file"
Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.66
diff -u -p -r1.66 configure.ac
--- configure.ac 28 May 2007 18:52:41 -0000 1.66
+++ configure.ac 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
#
# 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Index: doc/.cvsignore
===================================================================
RCS file: /sources/m4/m4/doc/.cvsignore,v
retrieving revision 1.6
diff -u -p -r1.6 .cvsignore
--- doc/.cvsignore 4 Oct 2006 14:32:36 -0000 1.6
+++ doc/.cvsignore 10 Jul 2007 20:36:48 -0000
@@ -16,6 +16,7 @@
.dirstamp
fdl.texi
gendocs_template
+gpl-3.0.texi
Makefile.in
Makefile
manual
Index: doc/m4.texinfo
===================================================================
RCS file: /sources/m4/m4/doc/m4.texinfo,v
retrieving revision 1.107
diff -u -p -r1.107 m4.texinfo
--- doc/m4.texinfo 26 Jun 2007 11:31:55 -0000 1.107
+++ doc/m4.texinfo 10 Jul 2007 20:36:48 -0000
@@ -138,6 +138,8 @@ problems, please do not hesitate to repo
* Compatibility:: Compatibility with other versions of @code{m4}
* Answers:: Correct version of some examples
+
+* Copying This Package:: How to make copies of the overall M4 package
* Copying This Manual:: How to make copies of this manual
* Indices:: Indices of concepts and macros
@@ -288,6 +290,10 @@ Correct version of some examples
* Improved cleardivert:: Solution for @code{cleardivert}
* Improved fatal_error:: Solution for @code{fatal_error}
+How to make copies of the overall M4 package
+
+* Copying:: GNU General Public License
+
How to make copies of this manual
* GNU Free Documentation License:: License for copying this manual
@@ -403,8 +409,8 @@ addressed some long standing bugs in the
@acronym{GNU} @code{m4} 1.4 that were floating around the net and
released 1.4.3 and 1.4.4. And in 2006, Eric Blake joined the team and
prepared patches for the release of 1.4.5, 1.4.6, 1.4.7, and 1.4.8. The
-1.4.x series remains open for bug fixes, including release 1.4.9 and
-1.4.10 in 2007.
+1.4.x series remains open for bug fixes, including releases 1.4.9,
+1.4.10, and 1.4.11 in 2007.
Meanwhile, development was underway for new features for @code{m4},
such as dynamic module loading and additional builtins, practically
@@ -8105,9 +8111,31 @@ fatal_error(`inside wrapped text')')
@c ========================================================== Appendices
address@hidden Copying This Package
address@hidden How to make copies of the overall M4 package
address@hidden License, code
address@hidden GPL, GNU Public License
address@hidden GNU Public License
+
+This appendix covers the license for copying the source code of the
+overall M4 package. This manual is under a different set of
+restrictions, covered later (@pxref{Copying This Manual}).
+
address@hidden
+* Copying:: GNU General Public License
address@hidden menu
+
address@hidden gpl-3.0.texi
+
@node Copying This Manual
@appendix How to make copies of this manual
address@hidden License
address@hidden License, manual
address@hidden GNU Free Documentation License
+
+This appendix covers the license for copying this manual. Note that
+some of the longer examples in this manual are also distributed in the
+directory @address@hidden/@/examples/}, where a more
+permissive license is in effect when copying just the examples.
@menu
* GNU Free Documentation License:: License for copying this manual
Index: local/doc/gpl-3.0.texi.diff
===================================================================
RCS file: local/doc/gpl-3.0.texi.diff
diff -N local/doc/gpl-3.0.texi.diff
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ local/doc/gpl-3.0.texi.diff 10 Jul 2007 20:36:48 -0000
@@ -0,0 +1,36 @@
+--- ../gnulib/doc/gpl-3.0.texi 2007-07-04 11:50:35.890625000 -0600
++++ doc/gpl-3.0.texi 2007-07-04 20:58:11.468750000 -0600
+@@ -1,5 +1,5 @@
+ @node Copying
address@hidden GNU General Public License
address@hidden GNU General Public License
+ @center Version 3, 29 June 2007
+
+ @c This file is intended to be included in another file.
+@@ -222,7 +222,7 @@
+ conditions:
+
+ @enumerate a
address@hidden
address@hidden
+ The work must carry prominent notices stating that you modified it,
+ and giving a relevant date.
+
+@@ -670,7 +670,7 @@
+ the ``copyright'' line and a pointer to where the full notice is found.
+
+ @smallexample
address@hidden line to give the program's name and a brief idea of what it
does.}
address@hidden line to give the program's name and a brief idea of what it
does.}
+ Copyright (C) @var{year} @var{name of author}
+
+ This program is free software: you can redistribute it and/or modify
+@@ -693,7 +693,7 @@
+ notice like this when it starts in an interactive mode:
+
+ @smallexample
address@hidden Copyright (C) @var{year} @var{name of author}
address@hidden Copyright (C) @var{year} @var{name of author}
+ This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show
w}.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type @samp{show c} for details.
Index: ltdl/config/mailnotify
===================================================================
RCS file: /sources/m4/m4/ltdl/config/mailnotify,v
retrieving revision 1.1
diff -u -p -r1.1 mailnotify
--- ltdl/config/mailnotify 4 May 2005 15:45:44 -0000 1.1
+++ ltdl/config/mailnotify 10 Jul 2007 20:36:48 -0000
@@ -3,13 +3,13 @@
# mailnotify (GNU cvs-utils) version 0.2
# Written by Gary V. Vaughan <address@hidden>
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2007 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.
# 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -137,7 +137,7 @@ func_missing_arg ()
func_usage ()
{
$SED '/^# Usage:/,/# -h/ {
- s/^# //; s/^# *$//;
+ s/^# //; s/^# *$//;
s/\$progname/'$progname'/;
p;
}; d' < "$progpath"
@@ -151,7 +151,7 @@ func_usage ()
func_help ()
{
$SED '/^# Usage:/,/# Report bugs to/ {
- s/^# //; s/^# *$//;
+ s/^# //; s/^# *$//;
s/\$progname/'$progname'/;
p;
}; d' < "$progpath"
@@ -163,9 +163,9 @@ func_help ()
func_version ()
{
$SED '/^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //; s/^# *$//;
- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/;
- p;
+ s/^# //; s/^# *$//;
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/;
+ p;
}; d' < "$progpath"
exit $EXIT_SUCCESS
}
@@ -276,9 +276,9 @@ func_version ()
fi
else
eval test -n \"\$datafile$multipart\" ||
- func_fatal_error "-f is required."
+ func_fatal_error "-f is required."
eval test -n \"\$ctype$multipart\" ||
- func_fatal_error "with output directed to a file, -m is required"
+ func_fatal_error "with output directed to a file, -m is required"
fi
eval test -f \"\$datafile$multipart\" ||
eval func_fatal_error \"\$datafile$multipart: file not found\"
@@ -380,17 +380,17 @@ func_sendmail ()
func_verbose "Delivering mail, please wait..."
if test -n "$from_name"; then
- $SENDMAIL -F "$from_name" -f "$from_addr" $my_destination
< "$my_infile"
+ $SENDMAIL -F "$from_name" -f "$from_addr" $my_destination < "$my_infile"
elif test -n "$from_addr"; then
- $SENDMAIL -f "$from_addr" $my_destination < "$my_infile"
+ $SENDMAIL -f "$from_addr" $my_destination < "$my_infile"
else
- $SENDMAIL $my_destination < "$my_infile"
+ $SENDMAIL $my_destination < "$my_infile"
fi
if test $? -eq 0; then
- func_verbose "...succeeded."
- rm $my_infile
+ func_verbose "...succeeded."
+ rm $my_infile
else
- func_fatal_error "Mail delivery failed, draft mail is in $my_infile"
+ func_fatal_error "Mail delivery failed, draft mail is in $my_infile"
fi
}
@@ -409,7 +409,7 @@ func_sendmail ()
do
case $destination in
"") destination="$to" ;;
- *) destination="$destination, $to" ;;
+ *) destination="$destination, $to" ;;
esac
done
@@ -423,7 +423,7 @@ func_sendmail ()
if test -z "$outputfile"; then
destination=""
for to; do
- to_addr=`echo "$to" | sed "$sed_mail_address"`
+ to_addr=`echo "$to" | sed "$sed_mail_address"`
test -n "$to_addr" || to_addr="$to"
destination="$destination $to_addr"
done
Index: ltdl/config/mkstamp
===================================================================
RCS file: /sources/m4/m4/ltdl/config/mkstamp,v
retrieving revision 1.1
diff -u -p -r1.1 mkstamp
--- ltdl/config/mkstamp 4 May 2005 15:45:44 -0000 1.1
+++ ltdl/config/mkstamp 10 Jul 2007 20:36:48 -0000
@@ -1,12 +1,12 @@
#! /bin/sh
# mkstamp - extract data from Revision and Date RCS tags in a file
-# Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2003, 2007 Free Software Foundation, Inc.
# Alexandre Oliva <address@hidden>
#
# This file 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
Index: ltdl/m4/debug.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/debug.m4,v
retrieving revision 1.4
diff -u -p -r1.4 debug.m4
--- ltdl/m4/debug.m4 5 Sep 2006 16:58:02 -0000 1.4
+++ ltdl/m4/debug.m4 10 Jul 2007 20:36:48 -0000
@@ -1,13 +1,13 @@
## -*- Autoconf -*-
## debug.m4 -- massage compiler flags for debugging/optimisation
##
-## Copyright (C) 1999-2000, 2006 Ralf S. Engelschall
+## Copyright (C) 1999-2000, 2006, 2007 Ralf S. Engelschall
## Written by <address@hidden>
## Modified for M4 by Gary V. Vaughan <address@hidden>
##
## 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 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
Index: ltdl/m4/gmp.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/gmp.m4,v
retrieving revision 1.3
diff -u -p -r1.3 gmp.m4
--- ltdl/m4/gmp.m4 9 Jan 2007 05:05:21 -0000 1.3
+++ ltdl/m4/gmp.m4 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
#
# 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -30,7 +30,7 @@ case $use_gmp:$LIBADD_GMP:$ac_cv_header_
;;
*::yes)
AC_MSG_WARN([gmp library not found or does not appear to work
- but `gmp.h' is present])
+ but `gmp.h' is present])
M4_cv_using_lib_gmp=no
;;
*:-lgmp:no)
@@ -65,8 +65,8 @@ LIBS=$M4_gmp_save_LIBS
AC_SUBST([LIBADD_GMP])
AC_CACHE_CHECK([if using GNU multiple precision arithmetic library],
- [M4_cv_using_lib_gmp],
- [_M4_LIB_GMP])
+ [M4_cv_using_lib_gmp],
+ [_M4_LIB_GMP])
# Don't try to link in libgmp if we are not using it after the last call
if test "$M4_cv_using_lib_gmp" = yes; then
Index: ltdl/m4/gnulib-cache.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/gnulib-cache.m4,v
retrieving revision 1.30
diff -u -p -r1.30 gnulib-cache.m4
--- ltdl/m4/gnulib-cache.m4 28 May 2007 18:52:41 -0000 1.30
+++ ltdl/m4/gnulib-cache.m4 10 Jul 2007 20:36:48 -0000
@@ -15,11 +15,11 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnu --m4-
base=ltdl/m4 --doc-base=doc --aux-dir=ltdl/config --with-tests --libtool --
macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp cloexec
close-stream closein config-h configmake dirname error exit fdl fflush
filenamecat fopen-safer fprintf-posix free fseeko gendocs gettext gnupload
mkstemp obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-
safer strnlen strtol tempname unlocked-io vasprintf-posix verror xalloc xalloc-
die xstrndup xstrtol xvasprintf
+# gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-
base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=ltdl/config --with-tests --
libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp
cloexec close-stream closein config-h configmake dirname error exit fdl fflush
filenamecat fopen-safer fprintf-posix free fseeko gendocs gettext gnupload gpl-
3.0 mkstemp obstack progname regex regexprops-generic sprintf-posix stdbool
stdlib-safer strnlen strtol tempname unlocked-io vasprintf-posix verror xalloc
xalloc-die xstrndup xstrtol xvasprintf
# Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_LOCAL_DIR([])
-gl_MODULES([assert autobuild avltree-oset binary-io clean-temp cloexec close-
stream closein config-h configmake dirname error exit fdl fflush filenamecat
fopen-safer fprintf-posix free fseeko gendocs gettext gnupload mkstemp obstack
progname regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen
strtol tempname unlocked-io vasprintf-posix verror xalloc xalloc-die xstrndup
xstrtol xvasprintf])
+gl_LOCAL_DIR([local])
+gl_MODULES([assert autobuild avltree-oset binary-io clean-temp cloexec close-
stream closein config-h configmake dirname error exit fdl fflush filenamecat
fopen-safer fprintf-posix free fseeko gendocs gettext gnupload gpl-3.0 mkstemp
obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-safer
strnlen strtol tempname unlocked-io vasprintf-posix verror xalloc xalloc-die
xstrndup xstrtol xvasprintf])
gl_AVOID([])
gl_SOURCE_BASE([gnu])
gl_M4_BASE([ltdl/m4])
Index: ltdl/m4/m4-error.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/m4-error.m4,v
retrieving revision 1.2
diff -u -p -r1.2 m4-error.m4
--- ltdl/m4/m4-error.m4 16 Jun 2006 03:51:29 -0000 1.2
+++ ltdl/m4/m4-error.m4 10 Jul 2007 20:36:48 -0000
@@ -2,11 +2,11 @@
# m4-error.m4 -- Use the installed version of error.h if available.
# Written by Gary V. Vaughan <address@hidden>
#
-# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc
+# Copyright (C) 2003, 2004, 2006, 2007 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Index: ltdl/m4/m4-getopt.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/m4-getopt.m4,v
retrieving revision 1.4
diff -u -p -r1.4 m4-getopt.m4
--- ltdl/m4/m4-getopt.m4 4 Jul 2006 16:29:34 -0000 1.4
+++ ltdl/m4/m4-getopt.m4 10 Jul 2007 20:36:48 -0000
@@ -2,11 +2,11 @@
# m4-getopt.m4 -- Use the installed version of getopt.h if available.
# Written by Gary V. Vaughan <address@hidden>
#
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc
+# Copyright (C) 2005, 2006, 2007 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -44,7 +44,7 @@ if test -z "$GETOPT_H"; then
AC_CACHE_CHECK([for working gnu getopt function], [gl_cv_func_gnu_getopt],
[AC_RUN_IFELSE(
[AC_LANG_PROGRAM([#include <getopt.h>],
- [[
+ [[
char *myargv[3];
myargv[0] = "conftest";
myargv[1] = "-+";
@@ -57,7 +57,7 @@ if test -z "$GETOPT_H"; then
dnl Solaris 10 getopt doesn't handle `+' as a leading character in an
dnl option string (as of 2005-05-05).
AC_CHECK_DECL([getopt_clip],
- [gl_cv_func_gnu_getopt=no], [gl_cv_func_gnu_getopt=yes],
+ [gl_cv_func_gnu_getopt=no], [gl_cv_func_gnu_getopt=yes],
[#include <getopt.h>])])])
test X"$gl_cv_func_gnu_getopt" = Xno && GETOPT_H=getopt.h
fi
Index: ltdl/m4/m4-gettext.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/m4-gettext.m4,v
retrieving revision 1.2
diff -u -p -r1.2 m4-gettext.m4
--- ltdl/m4/m4-gettext.m4 16 Jun 2006 03:51:29 -0000 1.2
+++ ltdl/m4/m4-gettext.m4 10 Jul 2007 20:36:48 -0000
@@ -2,11 +2,11 @@
# m4-gettext.m4 -- Use the installed version of GNU gettext if available.
# Written by Gary V. Vaughan <address@hidden>
#
-# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc
+# Copyright (C) 2003, 2004, 2006, 2007 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Index: ltdl/m4/m4-obstack.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/m4-obstack.m4,v
retrieving revision 1.2
diff -u -p -r1.2 m4-obstack.m4
--- ltdl/m4/m4-obstack.m4 16 Jun 2006 03:51:29 -0000 1.2
+++ ltdl/m4/m4-obstack.m4 10 Jul 2007 20:36:48 -0000
@@ -1,12 +1,12 @@
# -*- Autoconf -*-
# m4-obstack.m4 -- the libc supplied version of obstacks if available.
#
-# Copyright (C) 2000, 2001, 2003, 2004, 2006 Free Software Foundation, Inc
+# Copyright (C) 2000, 2001, 2003, 2004, 2006, 2007 Free Software Foundation,
Inc
# Written by Gary V. Vaughan <address@hidden>
#
# 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -29,7 +29,7 @@ AC_DEFUN([M4_OBSTACK],
AC_BEFORE([gl_OBSTACK], [M4_OBSTACK])
AC_ARG_WITH([included-obstack],
[AS_HELP_STRING([--with-included-obstack],
- [use the obstack implementation included here])])
+ [use the obstack implementation included here])])
AC_CHECK_HEADERS([obstack.h], [], [], [AC_INCLUDES_DEFAULT])
Index: ltdl/m4/m4-regex.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/m4-regex.m4,v
retrieving revision 1.2
diff -u -p -r1.2 m4-regex.m4
--- ltdl/m4/m4-regex.m4 16 Jun 2006 03:51:29 -0000 1.2
+++ ltdl/m4/m4-regex.m4 10 Jul 2007 20:36:48 -0000
@@ -2,11 +2,11 @@
# m4-regex.m4 -- Use the installed regex if it is good enough.
# Written by Gary V. Vaughan <address@hidden>
#
-# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc
+# Copyright (C) 2003, 2004, 2006, 2007 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Index: ltdl/m4/stackovf.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/stackovf.m4,v
retrieving revision 1.4
diff -u -p -r1.4 stackovf.m4
--- ltdl/m4/stackovf.m4 16 Jan 2007 20:23:32 -0000 1.4
+++ ltdl/m4/stackovf.m4 10 Jul 2007 20:36:48 -0000
@@ -5,7 +5,7 @@
#
# 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Index: m4/builtin.c
===================================================================
RCS file: /sources/m4/m4/m4/builtin.c,v
retrieving revision 1.27
diff -u -p -r1.27 builtin.c
--- m4/builtin.c 8 Apr 2007 05:06:42 -0000 1.27
+++ m4/builtin.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/debug.c
===================================================================
RCS file: /sources/m4/m4/m4/debug.c,v
retrieving revision 1.31
diff -u -p -r1.31 debug.c
--- m4/debug.c 8 Apr 2007 05:06:42 -0000 1.31
+++ m4/debug.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/hash.c
===================================================================
RCS file: /sources/m4/m4/m4/hash.c,v
retrieving revision 1.21
diff -u -p -r1.21 hash.c
--- m4/hash.c 8 Apr 2007 05:06:42 -0000 1.21
+++ m4/hash.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/hash.h
===================================================================
RCS file: /sources/m4/m4/m4/hash.h,v
retrieving revision 1.13
diff -u -p -r1.13 hash.h
--- m4/hash.h 2 Apr 2007 12:06:23 -0000 1.13
+++ m4/hash.h 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/input.c
===================================================================
RCS file: /sources/m4/m4/m4/input.c,v
retrieving revision 1.66
diff -u -p -r1.66 input.c
--- m4/input.c 28 May 2007 21:48:41 -0000 1.66
+++ m4/input.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/m4.c
===================================================================
RCS file: /sources/m4/m4/m4/m4.c,v
retrieving revision 1.22
diff -u -p -r1.22 m4.c
--- m4/m4.c 8 Apr 2007 05:06:42 -0000 1.22
+++ m4/m4.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/m4module.h
===================================================================
RCS file: /sources/m4/m4/m4/m4module.h,v
retrieving revision 1.108
diff -u -p -r1.108 m4module.h
--- m4/m4module.h 28 May 2007 21:48:41 -0000 1.108
+++ m4/m4module.h 10 Jul 2007 20:36:48 -0000
@@ -5,7 +5,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/m4private.h
===================================================================
RCS file: /sources/m4/m4/m4/m4private.h,v
retrieving revision 1.80
diff -u -p -r1.80 m4private.h
--- m4/m4private.h 28 May 2007 21:48:41 -0000 1.80
+++ m4/m4private.h 10 Jul 2007 20:36:48 -0000
@@ -5,7 +5,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/macro.c
===================================================================
RCS file: /sources/m4/m4/m4/macro.c,v
retrieving revision 1.68
diff -u -p -r1.68 macro.c
--- m4/macro.c 28 May 2007 21:48:41 -0000 1.68
+++ m4/macro.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/module.c
===================================================================
RCS file: /sources/m4/m4/m4/module.c,v
retrieving revision 1.50
diff -u -p -r1.50 module.c
--- m4/module.c 8 Apr 2007 05:06:42 -0000 1.50
+++ m4/module.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/output.c
===================================================================
RCS file: /sources/m4/m4/m4/output.c,v
retrieving revision 1.45
diff -u -p -r1.45 output.c
--- m4/output.c 31 May 2007 13:26:39 -0000 1.45
+++ m4/output.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/path.c
===================================================================
RCS file: /sources/m4/m4/m4/path.c,v
retrieving revision 1.25
diff -u -p -r1.25 path.c
--- m4/path.c 2 Apr 2007 12:06:23 -0000 1.25
+++ m4/path.c 10 Jul 2007 20:36:48 -0000
@@ -5,7 +5,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/resyntax.c
===================================================================
RCS file: /sources/m4/m4/m4/resyntax.c,v
retrieving revision 1.4
diff -u -p -r1.4 resyntax.c
--- m4/resyntax.c 1 Feb 2007 05:43:09 -0000 1.4
+++ m4/resyntax.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/symtab.c
===================================================================
RCS file: /sources/m4/m4/m4/symtab.c,v
retrieving revision 1.72
diff -u -p -r1.72 symtab.c
--- m4/symtab.c 8 Apr 2007 05:06:42 -0000 1.72
+++ m4/symtab.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/syntax.c
===================================================================
RCS file: /sources/m4/m4/m4/syntax.c,v
retrieving revision 1.22
diff -u -p -r1.22 syntax.c
--- m4/syntax.c 8 Apr 2007 05:06:42 -0000 1.22
+++ m4/syntax.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/system_.h
===================================================================
RCS file: /sources/m4/m4/m4/system_.h,v
retrieving revision 1.22
diff -u -p -r1.22 system_.h
--- m4/system_.h 26 May 2007 02:47:07 -0000 1.22
+++ m4/system_.h 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: m4/utility.c
===================================================================
RCS file: /sources/m4/m4/m4/utility.c,v
retrieving revision 1.59
diff -u -p -r1.59 utility.c
--- m4/utility.c 8 Apr 2007 05:06:42 -0000 1.59
+++ m4/utility.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/evalparse.c
===================================================================
RCS file: /sources/m4/m4/modules/evalparse.c,v
retrieving revision 1.18
diff -u -p -r1.18 evalparse.c
--- modules/evalparse.c 2 Apr 2007 12:06:23 -0000 1.18
+++ modules/evalparse.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/format.c
===================================================================
RCS file: /sources/m4/m4/modules/format.c,v
retrieving revision 1.23
diff -u -p -r1.23 format.c
--- modules/format.c 9 Jul 2007 13:21:57 -0000 1.23
+++ modules/format.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/gnu.c
===================================================================
RCS file: /sources/m4/m4/modules/gnu.c,v
retrieving revision 1.73
diff -u -p -r1.73 gnu.c
--- modules/gnu.c 30 May 2007 13:36:59 -0000 1.73
+++ modules/gnu.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/import.c
===================================================================
RCS file: /sources/m4/m4/modules/import.c,v
retrieving revision 1.8
diff -u -p -r1.8 import.c
--- modules/import.c 2 Apr 2007 12:06:23 -0000 1.8
+++ modules/import.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/load.c
===================================================================
RCS file: /sources/m4/m4/modules/load.c,v
retrieving revision 1.22
diff -u -p -r1.22 load.c
--- modules/load.c 2 Apr 2007 12:06:23 -0000 1.22
+++ modules/load.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/m4.c
===================================================================
RCS file: /sources/m4/m4/modules/m4.c,v
retrieving revision 1.110
diff -u -p -r1.110 m4.c
--- modules/m4.c 31 May 2007 13:26:39 -0000 1.110
+++ modules/m4.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/m4.h
===================================================================
RCS file: /sources/m4/m4/modules/m4.h,v
retrieving revision 1.9
diff -u -p -r1.9 m4.h
--- modules/m4.h 2 Apr 2007 12:06:23 -0000 1.9
+++ modules/m4.h 10 Jul 2007 20:36:48 -0000
@@ -1,9 +1,9 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2007 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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/modtest.c
===================================================================
RCS file: /sources/m4/m4/modules/modtest.c,v
retrieving revision 1.16
diff -u -p -r1.16 modtest.c
--- modules/modtest.c 2 Apr 2007 12:06:23 -0000 1.16
+++ modules/modtest.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/mpeval.c
===================================================================
RCS file: /sources/m4/m4/modules/mpeval.c,v
retrieving revision 1.25
diff -u -p -r1.25 mpeval.c
--- modules/mpeval.c 2 Apr 2007 12:06:23 -0000 1.25
+++ modules/mpeval.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/perl.c
===================================================================
RCS file: /sources/m4/m4/modules/perl.c,v
retrieving revision 1.17
diff -u -p -r1.17 perl.c
--- modules/perl.c 2 Apr 2007 12:06:23 -0000 1.17
+++ modules/perl.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/shadow.c
===================================================================
RCS file: /sources/m4/m4/modules/shadow.c,v
retrieving revision 1.15
diff -u -p -r1.15 shadow.c
--- modules/shadow.c 2 Apr 2007 12:06:23 -0000 1.15
+++ modules/shadow.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/stdlib.c
===================================================================
RCS file: /sources/m4/m4/modules/stdlib.c,v
retrieving revision 1.17
diff -u -p -r1.17 stdlib.c
--- modules/stdlib.c 2 Apr 2007 12:06:23 -0000 1.17
+++ modules/stdlib.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/time.c
===================================================================
RCS file: /sources/m4/m4/modules/time.c,v
retrieving revision 1.18
diff -u -p -r1.18 time.c
--- modules/time.c 2 Apr 2007 12:06:23 -0000 1.18
+++ modules/time.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: modules/traditional.c
===================================================================
RCS file: /sources/m4/m4/modules/traditional.c,v
retrieving revision 1.7
diff -u -p -r1.7 traditional.c
--- modules/traditional.c 2 Apr 2007 12:06:23 -0000 1.7
+++ modules/traditional.c 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: po/Makevars
===================================================================
RCS file: /sources/m4/m4/po/Makevars,v
retrieving revision 1.5
diff -u -p -r1.5 Makevars
--- po/Makevars 5 Sep 2006 23:16:40 -0000 1.5
+++ po/Makevars 10 Jul 2007 20:36:48 -0000
@@ -1,10 +1,10 @@
## This file is part of GNU M4.
##
-## Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+## Copyright (C) 2002, 2006, 2007 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 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
Index: src/freeze.c
===================================================================
RCS file: /sources/m4/m4/src/freeze.c,v
retrieving revision 1.66
diff -u -p -r1.66 freeze.c
--- src/freeze.c 28 May 2007 21:48:42 -0000 1.66
+++ src/freeze.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: src/m4.h
===================================================================
RCS file: /sources/m4/m4/src/m4.h,v
retrieving revision 1.25
diff -u -p -r1.25 m4.h
--- src/m4.h 8 Apr 2007 05:06:42 -0000 1.25
+++ src/m4.h 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: src/main.c
===================================================================
RCS file: /sources/m4/m4/src/main.c,v
retrieving revision 1.112
diff -u -p -r1.112 main.c
--- src/main.c 12 Apr 2007 16:27:20 -0000 1.112
+++ src/main.c 10 Jul 2007 20:36:48 -0000
@@ -5,7 +5,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: src/stackovf.c
===================================================================
RCS file: /sources/m4/m4/src/stackovf.c,v
retrieving revision 1.23
diff -u -p -r1.23 stackovf.c
--- src/stackovf.c 8 Apr 2007 05:06:42 -0000 1.23
+++ src/stackovf.c 10 Jul 2007 20:36:48 -0000
@@ -4,7 +4,7 @@
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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Index: tests/builtins.at
===================================================================
RCS file: /sources/m4/m4/tests/builtins.at,v
retrieving revision 1.41
diff -u -p -r1.41 builtins.at
--- tests/builtins.at 31 May 2007 13:26:40 -0000 1.41
+++ tests/builtins.at 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
# 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)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
Index: tests/freeze.at
===================================================================
RCS file: /sources/m4/m4/tests/freeze.at,v
retrieving revision 1.12
diff -u -p -r1.12 freeze.at
--- tests/freeze.at 31 May 2007 13:26:40 -0000 1.12
+++ tests/freeze.at 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
# 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)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
Index: tests/generate.awk
===================================================================
RCS file: /sources/m4/m4/tests/generate.awk,v
retrieving revision 1.25
diff -u -p -r1.25 generate.awk
--- tests/generate.awk 13 Jan 2007 13:55:37 -0000 1.25
+++ tests/generate.awk 10 Jul 2007 20:36:48 -0000
@@ -5,7 +5,7 @@
#
# 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Index: tests/m4.in
===================================================================
RCS file: /sources/m4/m4/tests/m4.in,v
retrieving revision 1.8
diff -u -p -r1.8 m4.in
--- tests/m4.in 14 Sep 2006 00:37:26 -0000 1.8
+++ tests/m4.in 10 Jul 2007 20:36:48 -0000
@@ -4,11 +4,11 @@
#
# This file is part of GNU M4.
#
-# Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006, 2007 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Index: tests/macros.at
===================================================================
RCS file: /sources/m4/m4/tests/macros.at,v
retrieving revision 1.13
diff -u -p -r1.13 macros.at
--- tests/macros.at 10 Apr 2007 13:56:20 -0000 1.13
+++ tests/macros.at 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
# 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)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
Index: tests/modules.at
===================================================================
RCS file: /sources/m4/m4/tests/modules.at,v
retrieving revision 1.24
diff -u -p -r1.24 modules.at
--- tests/modules.at 15 Jan 2007 14:04:27 -0000 1.24
+++ tests/modules.at 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
# 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)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
Index: tests/options.at
===================================================================
RCS file: /sources/m4/m4/tests/options.at,v
retrieving revision 1.26
diff -u -p -r1.26 options.at
--- tests/options.at 28 May 2007 22:08:44 -0000 1.26
+++ tests/options.at 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
# 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)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
Index: tests/others.at
===================================================================
RCS file: /sources/m4/m4/tests/others.at,v
retrieving revision 1.34
diff -u -p -r1.34 others.at
--- tests/others.at 12 Apr 2007 17:38:28 -0000 1.34
+++ tests/others.at 10 Jul 2007 20:36:48 -0000
@@ -3,7 +3,7 @@
# 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)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
Index: tests/stackovf.test
===================================================================
RCS file: /sources/m4/m4/tests/stackovf.test,v
retrieving revision 1.3
diff -u -p -r1.3 stackovf.test
--- tests/stackovf.test 4 May 2005 17:19:46 -0000 1.3
+++ tests/stackovf.test 10 Jul 2007 20:36:48 -0000
@@ -1,10 +1,10 @@
#!/bin/sh
# This file is part of the GNU m4 testsuite
-# Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2003, 2007 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -86,7 +86,7 @@ else
exitcode=0
;;
*ut*of*emory*|*emory*xhausted)
- echo "*** Test is INCONCLUSIVE (ran out of heap before stack
overflow)";
+ echo "*** Test is INCONCLUSIVE (ran out of heap before stack overflow)";
;;
*) echo "*** Test FAILED. $M4 aborted unexpectedly. Output:";
;;
Index: tests/testsuite.at
===================================================================
RCS file: /sources/m4/m4/tests/testsuite.at,v
retrieving revision 1.27
diff -u -p -r1.27 testsuite.at
--- tests/testsuite.at 13 Jan 2007 13:55:37 -0000 1.27
+++ tests/testsuite.at 10 Jul 2007 20:36:48 -0000
@@ -5,7 +5,7 @@
# 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)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,