Upgrade to FDL-1.3

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'm applying this to branch-1.6, and similar to master.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkkQVyAACgkQ84KuGfSFAYBi9QCdF247smdcnfl/3gwj0iMVNXur
ocIAn32Q+ejeQT363b0+SMVKhvuAS7Jf
=gUIs
-----END PGP SIGNATURE-----

>From 653ecf34acfff2ae6ef0c6a58526988c1d9ae558 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 4 Nov 2008 07:05:36 -0700
Subject: [PATCH] Upgrade to FDL 1.3.

* m4/gnulib-cache.m4: Replace fdl module with fdl-1.3.
* doc/m4.texinfo (GNU Free Documentation License): Upgrade
license.
* doc/Makefile.am (m4_TEXINFOS): Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog          |    8 ++++++++
 doc/.cvsignore     |    2 +-
 doc/.gitignore     |    2 +-
 doc/Makefile.am    |    2 +-
 doc/m4.texinfo     |    2 +-
 m4/gnulib-cache.m4 |    4 ++--
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8985604..cf0ffc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-04  Eric Blake  <address@hidden>
+
+       Upgrade to FDL 1.3.
+       * m4/gnulib-cache.m4: Replace fdl module with fdl-1.3.
+       * doc/m4.texinfo (GNU Free Documentation License): Upgrade
+       license.
+       * doc/Makefile.am (m4_TEXINFOS): Likewise.
+
 2008-10-11  Eric Blake  <address@hidden>
 
        Mention release of 1.4.12.
diff --git a/doc/.cvsignore b/doc/.cvsignore
index 7836b14..81f5a1e 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,4 +1,4 @@
-fdl.texi
+fdl-1.3.texi
 gendocs_template
 gpl-3.0.texi
 m4.1
diff --git a/doc/.gitignore b/doc/.gitignore
index 7836b14..81f5a1e 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,4 +1,4 @@
-fdl.texi
+fdl-1.3.texi
 gendocs_template
 gpl-3.0.texi
 m4.1
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b1b7eac..94461f0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,7 +20,7 @@
 ## This file written by Eric Blake <address@hidden>
 
 info_TEXINFOS = m4.texinfo
-m4_TEXINFOS = fdl.texi gpl-3.0.texi
+m4_TEXINFOS = fdl-1.3.texi gpl-3.0.texi
 man_MANS = $(srcdir)/m4.1
 EXTRA_DIST = $(man_MANS) gendocs_template
 MAINTAINERCLEANFILES = $(man_MANS) gendocs_template
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 912d0f4..9fcbddd 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -8654,7 +8654,7 @@ GNU Free Documentation License
 @cindex FDL, GNU Free Documentation License
 @cindex GNU Free Documentation License
 @cindex Free Documentation License (FDL), GNU
address@hidden fdl.texi
address@hidden fdl-1.3.texi
 
 @node Indices
 @appendix Indices of concepts and macros
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 1b52a1c..8b0b99a 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --with-tests --no-libtool --macro-prefix=M4 announce-gen 
assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein 
config-h dirname error fdl fflush filenamecat flexmember fopen fopen-safer 
fseeko gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 hash 
intprops memmem mkstemp obstack obstack-printf-posix progname quote regex 
stdbool stdint stdlib-safer strtod strtol unlocked-io vasnprintf-posix verror 
version-etc version-etc-fsf xalloc xmemdup0 xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --with-tests --no-libtool --macro-prefix=M4 announce-gen 
assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein 
config-h dirname error fdl-1.3 fflush filenamecat flexmember fopen fopen-safer 
fseeko gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 hash 
intprops memmem mkstemp obstack obstack-printf-posix progname quote regex 
stdbool stdint stdlib-safer strtod strtol unlocked-io vasnprintf-posix verror 
version-etc version-etc-fsf xalloc xmemdup0 xprintf xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -32,7 +32,7 @@ gl_MODULES([
   config-h
   dirname
   error
-  fdl
+  fdl-1.3
   fflush
   filenamecat
   flexmember
-- 
1.6.0.2