Update license to GPLv3.

3 files changed, 15 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c7bf23..ed1cdd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,14 @@
 
 	All source files are now under GPLv3+.
 	* COPYING: Replace with GPLv3.
-	* **/configure.ac, **/Makefile.in, **/*.h, **/*.c, **/*.cc, **/*.icc:
+	* **/configure.ac, **/Makefile.*, **/*.h, **/*.c, **/*.cc, **/*.icc:
 	Change copyright notice to GPLv3+.
 	* src/options.cc (Options::parse_options): Update --version output
 	accordingly.
+	* doc/gperf.texi: Reference the GPLv3.
+	* doc/gpl-3.0.texi: New file, copied from the gnulib git repository.
+	* doc/gpl.texinfo: Remove file.
+	* doc/Makefile.in: Update.
 
 2008-05-06  Bruno Haible  <bruno@clisp.org>
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e8f64bd..fc06c15 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -68,13 +68,13 @@ all : info ps pdf html
 
 info : $(srcdir)/gperf.info
 
-$(srcdir)/gperf.info : $(srcdir)/gperf.texi $(srcdir)/gpl.texinfo
+$(srcdir)/gperf.info : $(srcdir)/gperf.texi $(srcdir)/gpl-3.0.texi
 	cd $(srcdir) && $(MAKEINFO) --no-split gperf.texi
 
 
 dvi : $(srcdir)/gperf.dvi
 
-$(srcdir)/gperf.dvi : $(srcdir)/gperf.texi $(srcdir)/gpl.texinfo
+$(srcdir)/gperf.dvi : $(srcdir)/gperf.texi $(srcdir)/gpl-3.0.texi
 	cd $(srcdir) && $(RM) gperf.aux gperf.toc gperf.cp gperf.fn gperf.ky gperf.pg gperf.tp gperf.vr gperf.log gperf.cps
 	cd $(srcdir) && $(TEXI2DVI) gperf.texi
 	cd $(srcdir) && $(RM) gperf.aux gperf.toc gperf.cp gperf.fn gperf.ky gperf.pg gperf.tp gperf.vr gperf.log gperf.cps
@@ -88,7 +88,7 @@ $(srcdir)/gperf.ps : $(srcdir)/gperf.dvi
 
 pdf : $(srcdir)/gperf.pdf
 
-$(srcdir)/gperf.pdf : $(srcdir)/gperf.texi $(srcdir)/gpl.texinfo
+$(srcdir)/gperf.pdf : $(srcdir)/gperf.texi $(srcdir)/gpl-3.0.texi
 	cd $(srcdir) && $(RM) gperf.aux gperf.toc gperf.cp gperf.fn gperf.ky gperf.pg gperf.tp gperf.vr gperf.log gperf.cps
 	cd $(srcdir) && $(TEXI2PDF) gperf.texi
 	cd $(srcdir) && $(RM) gperf.aux gperf.toc gperf.cp gperf.fn gperf.ky gperf.pg gperf.tp gperf.vr gperf.log gperf.cps
@@ -96,10 +96,10 @@ $(srcdir)/gperf.pdf : $(srcdir)/gperf.texi $(srcdir)/gpl.texinfo
 
 html : gperf.html gperf_toc.html
 
-gperf.html : $(srcdir)/gperf.texi $(srcdir)/gpl.texinfo
+gperf.html : $(srcdir)/gperf.texi $(srcdir)/gpl-3.0.texi
 	cd $(srcdir) && $(TEXI2HTML) -number -monolithic gperf.texi
 
-gperf_toc.html : $(srcdir)/gperf.texi $(srcdir)/gpl.texinfo
+gperf_toc.html : $(srcdir)/gperf.texi $(srcdir)/gpl-3.0.texi
 	cd $(srcdir) && $(RM) gperf_*.html
 	cd $(srcdir) && $(TEXI2HTML) -number -split_chapter gperf.texi
 
diff --git a/doc/gperf.texi b/doc/gperf.texi
index 1b33829..77eb469 100644
--- a/doc/gperf.texi
+++ b/doc/gperf.texi
@@ -40,7 +40,7 @@
 This file documents the features of the GNU Perfect Hash Function
 Generator @value{VERSION}.
 
-Copyright @copyright{} 1989-2007 Free Software Foundation, Inc.
+Copyright @copyright{} 1989-2008 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -78,7 +78,7 @@ Software Foundation instead of in the original English.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1989-2007 Free Software Foundation, Inc.
+Copyright @copyright{} 1989-2008 Free Software Foundation, Inc.
 
 
 Permission is granted to make and distribute verbatim copies of
@@ -113,8 +113,8 @@ utility, focusing on its features and how to use them, and how to report
 bugs.
 
 @menu
-* Copying::                     GNU @code{gperf} General Public License says
-                                how you can copy and share @code{gperf}.
+* Copying::                     GNU General Public License says how you can
+                                copy and share @code{gperf}.
 * Contributors::                People who have contributed to @code{gperf}.
 * Motivation::                  The purpose of @code{gperf}.
 * Search Structures::           Static search structures and GNU @code{gperf}
@@ -163,7 +163,7 @@ Invoking @code{gperf}
 
 @node Copying, Contributors, Top, Top
 @unnumbered GNU GENERAL PUBLIC LICENSE
-@include gpl.texinfo
+@include gpl-3.0.texi
 
 @node Contributors, Motivation, Copying, Top
 @unnumbered Contributors to GNU @code{gperf} Utility