I just applied this change to the 4.2.x code tree. The patch is
attached (not compressed this time, it's small).
2007-12-08 James Youngman <[EMAIL PROTECTED]>
Distribute findutils documentation under FDL 1.2.
* doc/find.texi: This file is now distributed under version 1.2 of
the GNU Free Documentation license. Include a copy of the
license document in the info and dvi files.
* doc/.cvsignore: Ignore fdl.texi.
* import-gnulib.config (modules): Import the fdl module.
* NEWS: Mention this fact.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/findutils/findutils/ChangeLog,v
retrieving revision 1.86.2.41
diff -u -p -r1.86.2.41 ChangeLog
--- ChangeLog 8 Dec 2007 15:40:56 -0000 1.86.2.41
+++ ChangeLog 8 Dec 2007 16:10:17 -0000
@@ -1,5 +1,13 @@
2007-12-08 James Youngman <[EMAIL PROTECTED]>
+ Distribute findutils documentation under FDL 1.2.
+ * doc/find.texi: This file is now distributed under version 1.2 of
+ the GNU Free Documentation license. Include a copy of the
+ license document in the info and dvi files.
+ * doc/.cvsignore: Ignore fdl.texi.
+ * import-gnulib.config (modules): Import the fdl module.
+ * NEWS: Mention this fact.
+
Updated to version 3 of the GNU General Public License.
* COPYING: Update to GPL version 3.
* find/defs.h, find/find.c,
@@ -28,6 +36,7 @@
under version 3 or later of the GNU GPL.
* depcomp, missing: Update from gnulib to get the current version
(which is distributed under GPL v3).
+ * NEWS: Mention this change.
* import-gnulib.sh: Use git rather than cvs to check the gnulib
code out (typically, when building findutils from CVS).
Index: NEWS
===================================================================
RCS file: /cvsroot/findutils/findutils/NEWS,v
retrieving revision 1.101.2.41
diff -u -p -r1.101.2.41 NEWS
--- NEWS 8 Dec 2007 15:25:23 -0000 1.101.2.41
+++ NEWS 8 Dec 2007 16:10:18 -0000
@@ -1,6 +1,12 @@
GNU findutils NEWS - User visible changes. -*- outline -*- (allout)*
* Major changes in release 4.2.32-CVS
+** License changes
+
+This version of findutils is now distributed under version 3 (or
+later) of the GNU GPL. The documentation is distributed under
+version 1.2 (or later) of the GNU Free Documentation License.
+
** Documentation Fixes
#19596: -printf %b should be compared with %s/512, not %s/1024.
Index: import-gnulib.config
===================================================================
RCS file: /cvsroot/findutils/findutils/import-gnulib.config,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 import-gnulib.config
--- import-gnulib.config 8 Dec 2007 15:25:23 -0000 1.1.2.6
+++ import-gnulib.config 8 Dec 2007 16:10:18 -0000
@@ -34,6 +34,7 @@ closein
closeout
dirname
error
+fdl
fileblocks
filemode
fnmatch-gnu
Index: doc/.cvsignore
===================================================================
RCS file: /cvsroot/findutils/findutils/doc/.cvsignore,v
retrieving revision 1.6.6.1
diff -u -p -r1.6.6.1 .cvsignore
--- doc/.cvsignore 21 Jul 2007 04:00:16 -0000 1.6.6.1
+++ doc/.cvsignore 8 Dec 2007 16:10:18 -0000
@@ -21,3 +21,4 @@ regexprops.texi
stamp-vti
texinfo.tex
version.texi
+fdl.texi
Index: doc/find.texi
===================================================================
RCS file: /cvsroot/findutils/findutils/doc/find.texi,v
retrieving revision 1.109.2.21
diff -u -p -r1.109.2.21 find.texi
--- doc/find.texi 20 Aug 2007 09:55:09 -0000 1.109.2.21
+++ doc/find.texi 8 Dec 2007 16:10:19 -0000
@@ -33,26 +33,12 @@ certain criteria and performing various
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.
-
[EMAIL PROTECTED]
-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).
-
[EMAIL PROTECTED] 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
@@ -70,7 +56,9 @@ translation approved by the Foundation.
@ifnottex
@node Top, Introduction, , (dir)
[EMAIL PROTECTED] GNU Findutils
@comment node-name, next, previous, up
[EMAIL PROTECTED]
This file documents the GNU utilities for finding files that match
certain criteria and performing various actions on them.
@@ -91,6 +79,7 @@ This is edition @value{EDITION}, for @co
* 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
@@ -4462,7 +4451,7 @@ only trusted programs.
@end table
@comment node-name, next, previous, up
[EMAIL PROTECTED] Error Messages, Primary Index, Security Considerations, Top
[EMAIL PROTECTED] Error Messages, GNU Free Documentation License, Security Considerations, Top
@chapter Error Messages
This section describes some of the error messages sometimes made by
@@ -4642,7 +4631,12 @@ you are having a problem understanding o
@email{bug-findutils@@gnu.org}.
[EMAIL PROTECTED] Primary Index, , Error Messages, Top
[EMAIL PROTECTED] GNU Free Documentation License, Primary Index, Error Messages, Top
[EMAIL PROTECTED] node-name, next, previous, up
[EMAIL PROTECTED] GNU Free Documentation License
[EMAIL PROTECTED] fdl.texi
+
[EMAIL PROTECTED] Primary Index, , GNU Free Documentation License, Top
@unnumbered @code{find} Primary Index
This is a list of all of the primaries (tests, actions, and options)
_______________________________________________
Findutils-patches mailing list
Findutils-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/findutils-patches
