# HG changeset patch # User Glenn Morris # Date 1185339971 0 # Node ID 1f2482de3237f743a2de738092987515f99ed122 # Parent ee787fc40e9346479b68848470ab28401c7e1ab0 Switch license to GPLv3 or later. diff -r ee787fc40e93 -r 1f2482de3237 lib-src/ChangeLog --- a/lib-src/ChangeLog Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/ChangeLog Wed Jul 25 05:06:11 2007 +0000 @@ -6233,7 +6233,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/Makefile.in --- a/lib-src/Makefile.in Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/Makefile.in Wed Jul 25 05:06:11 2007 +0000 @@ -6,7 +6,7 @@ # GNU Emacs 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. # GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/b2m.pl --- a/lib-src/b2m.pl Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/b2m.pl Wed Jul 25 05:06:11 2007 +0000 @@ -7,8 +7,8 @@ # 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 -# (at your option) any later version. +# 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, but # WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,9 @@ # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -# USA. +# along with this program; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301 USA. # Maintained by Jonathan Kamens . diff -r ee787fc40e93 -r 1f2482de3237 lib-src/cvtmail.c --- a/lib-src/cvtmail.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/cvtmail.c Wed Jul 25 05:06:11 2007 +0000 @@ -5,7 +5,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/digest-doc.c --- a/lib-src/digest-doc.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/digest-doc.c Wed Jul 25 05:06:11 2007 +0000 @@ -8,7 +8,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/ebrowse.c --- a/lib-src/ebrowse.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/ebrowse.c Wed Jul 25 05:06:11 2007 +0000 @@ -7,7 +7,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/emacsclient.c --- a/lib-src/emacsclient.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/emacsclient.c Wed Jul 25 05:06:11 2007 +0000 @@ -6,7 +6,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/emacstool.c --- a/lib-src/emacstool.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/emacstool.c Wed Jul 25 05:06:11 2007 +0000 @@ -6,7 +6,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/etags.c --- a/lib-src/etags.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/etags.c Wed Jul 25 05:06:11 2007 +0000 @@ -36,8 +36,8 @@ 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 -(at your option) any later version. +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, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -45,8 +45,9 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +along with this program; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* NB To comply with the above BSD license, copyright information is diff -r ee787fc40e93 -r 1f2482de3237 lib-src/fakemail.c --- a/lib-src/fakemail.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/fakemail.c Wed Jul 25 05:06:11 2007 +0000 @@ -6,7 +6,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/getopt.c --- a/lib-src/getopt.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/getopt.c Wed Jul 25 05:06:11 2007 +0000 @@ -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, 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, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/getopt1.c --- a/lib-src/getopt1.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/getopt1.c Wed Jul 25 05:06:11 2007 +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, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/getopt_.h --- a/lib-src/getopt_.h Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/getopt_.h Wed Jul 25 05:06:11 2007 +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, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/getopt_int.h --- a/lib-src/getopt_int.h Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/getopt_int.h Wed Jul 25 05:06:11 2007 +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, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/gettext.h --- a/lib-src/gettext.h Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/gettext.h Wed Jul 25 05:06:11 2007 +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, 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, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/grep-changelog --- a/lib-src/grep-changelog Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/grep-changelog Wed Jul 25 05:06:11 2007 +0000 @@ -7,7 +7,7 @@ # # GNU Emacs 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. # # GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/hexl.c --- a/lib-src/hexl.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/hexl.c Wed Jul 25 05:06:11 2007 +0000 @@ -6,8 +6,8 @@ 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 -(at your option) any later version. +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, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,8 +15,9 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +along with this program; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H #include diff -r ee787fc40e93 -r 1f2482de3237 lib-src/make-docfile.c --- a/lib-src/make-docfile.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/make-docfile.c Wed Jul 25 05:06:11 2007 +0000 @@ -6,7 +6,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/makefile.w32-in --- a/lib-src/makefile.w32-in Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/makefile.w32-in Wed Jul 25 05:06:11 2007 +0000 @@ -6,7 +6,7 @@ # # GNU Emacs 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. # # GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/movemail.c --- a/lib-src/movemail.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/movemail.c Wed Jul 25 05:06:11 2007 +0000 @@ -7,7 +7,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/ntlib.c --- a/lib-src/ntlib.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/ntlib.c Wed Jul 25 05:06:11 2007 +0000 @@ -6,7 +6,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/ntlib.h --- a/lib-src/ntlib.h Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/ntlib.h Wed Jul 25 05:06:11 2007 +0000 @@ -6,7 +6,7 @@ GNU Emacs 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 + Free Software Foundation; either version 3, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT diff -r ee787fc40e93 -r 1f2482de3237 lib-src/pop.c --- a/lib-src/pop.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/pop.c Wed Jul 25 05:06:11 2007 +0000 @@ -7,7 +7,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/pop.h --- a/lib-src/pop.h Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/pop.h Wed Jul 25 05:06:11 2007 +0000 @@ -7,7 +7,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/profile.c --- a/lib-src/profile.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/profile.c Wed Jul 25 05:06:11 2007 +0000 @@ -8,7 +8,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/rcs-checkin --- a/lib-src/rcs-checkin Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/rcs-checkin Wed Jul 25 05:06:11 2007 +0000 @@ -9,7 +9,7 @@ # # GNU Emacs 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. # # GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/rcs2log --- a/lib-src/rcs2log Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/rcs2log Wed Jul 25 05:06:11 2007 +0000 @@ -59,7 +59,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, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/sorted-doc.c --- a/lib-src/sorted-doc.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/sorted-doc.c Wed Jul 25 05:06:11 2007 +0000 @@ -8,7 +8,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/test-distrib.c --- a/lib-src/test-distrib.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/test-distrib.c Wed Jul 25 05:06:11 2007 +0000 @@ -7,7 +7,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/update-game-score.c --- a/lib-src/update-game-score.c Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/update-game-score.c Wed Jul 25 05:06:11 2007 +0000 @@ -5,7 +5,7 @@ GNU Emacs 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. GNU Emacs is distributed in the hope that it will be useful, diff -r ee787fc40e93 -r 1f2482de3237 lib-src/vcdiff --- a/lib-src/vcdiff Wed Jul 25 05:05:01 2007 +0000 +++ b/lib-src/vcdiff Wed Jul 25 05:06:11 2007 +0000 @@ -10,7 +10,7 @@ # # GNU Emacs 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. # # GNU Emacs is distributed in the hope that it will be useful,