[Findutils-patches] [PATCH] Fix Savannah bug #21634, No copy of FDL1.2.

[James Youngman]

2007-11-24  James Youngman  <address@hidden>

        Fix Savannah bug #21634, No copy of FDL1.2 included in source
        code.
        * doc/find.texi: Change license to the GNU Free Documentation
        License 1.2.
        (GNU Free Documentation License): Include fdl.texi
        * doc/find-maint.texi (GNU Free Documentation License): Include a
        copy of the FDL (it was already under this license).
        * doc/Makefile.am (find_maint_TEXINFOS): Include fdl.texi
        (find_TEXINFOS): Include fdl.texi
        * import-gnulib.config (modules): Include gpl-3.0 and fdl.
---
 doc/.cvsignore       |    2 ++
 doc/.gitignore       |    2 ++
 doc/Makefile.am      |    4 ++--
 doc/find-maint.texi  |    5 +++++
 doc/find.texi        |   31 +++++++++++--------------------
 import-gnulib.config |    2 ++
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 244cca6..8f838ee 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -27,3 +27,5 @@ getdate.texi
 find-maint.info
 stamp-1
 versionmaint.texi
+fdl.texi
+gpl-3.0.texi
diff --git a/doc/.gitignore b/doc/.gitignore
index 42d0984..d13650e 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -25,3 +25,5 @@ getdate.texi
 versionmaint.texi
 stamp-1
 find-maint.info
+fdl.texi
+gpl-3.0.texi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 55b5724..9ea014a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 info_TEXINFOS = find.texi find-maint.texi
-find_TEXINFOS = perm.texi getdate.texi regexprops.texi 
-find_maint_TEXINFOS = 
+find_TEXINFOS = perm.texi getdate.texi regexprops.texi fdl.texi
+find_maint_TEXINFOS = fdl.texi
 MOSTLYCLEANFILES = find.cps 
 CLEANFILES = find.txt find_mono.html findutils.texi_html_node.tar.gz
 
diff --git a/doc/find-maint.texi b/doc/find-maint.texi
index b994a6c..5f176f1 100644
--- a/doc/find-maint.texi
+++ b/doc/find-maint.texi
@@ -68,6 +68,7 @@ Free Documentation License''.
 * Internationalisation::
 * Security::
 * Making Releases::
+* GNU Free Documentation License::
 @end menu
 
 
@@ -1130,6 +1131,10 @@ Release} field of these bugs appropriately and make sure 
the
 @end enumerate
 
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden fdl.texi
+
 @bye
 
 @comment texi related words used by Emacs' spell checker ispell.el
diff --git a/doc/find.texi b/doc/find.texi
index f4ea166..9302015 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -34,26 +34,12 @@ certain criteria and performing various operations on them.
 Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,
 2007 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 preserved on all copies.
-
address@hidden
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
address@hidden ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be stated in a
-translation approved by the Foundation.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled
+``GNU Free Documentation License.''
 @end copying
 
 @titlepage
@@ -73,6 +59,7 @@ translation approved by the Foundation.
 @node Top
 @top GNU Findutils
 @comment  node-name,  next,  previous,  up
address@hidden
 
 This file documents the GNU utilities for finding files that match
 certain criteria and performing various actions on them.
@@ -94,6 +81,7 @@ This is edition @value{EDITION}, for @code{find} version 
@value{VERSION}.
 * Worked Examples::             Examples demonstrating more complex points.
 * Security Considerations::     Security issues relating to findutils.
 * Error Messages::              Explanations of some messages you might see.
+* GNU Free Documentation License::  Copying and sharing this manual.
 * Primary Index::               The components of @code{find} expressions.
 @end menu
 
@@ -5141,6 +5129,9 @@ error messages, but none seem to be candidates for 
guidance.  If
 you are having a problem understanding one of these, ask for help on
 @email{bug-findutils@@gnu.org}.
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden fdl.texi
 
 @node Primary Index
 @unnumbered @code{find} Primary Index
diff --git a/import-gnulib.config b/import-gnulib.config
index 30039dd..88513db 100644
--- a/import-gnulib.config
+++ b/import-gnulib.config
@@ -39,6 +39,7 @@ dirname
 error
 fchdir
 fcntl
+fdl
 fileblocks
 filemode
 fnmatch-gnu
@@ -48,6 +49,7 @@ getdate
 getline
 getopt
 gettext
+gpl-3.0
 human
 idcache
 inline
-- 
1.5.3.5