Upgrade to FDL-1.3

[Eric Blake]

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

I'm committing this.  There will be a later followup to remove
doc/fdl.texi once standards.texi is likewise upgraded, and once gnulib
supplies the new file gnu-oids.texi now used by upstream standards.texi
(so for now, standards.texi remains unchanged).

- --
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

iEYEARECAAYFAkkQUBMACgkQ84KuGfSFAYC64ACeJcVYgb/uxsAz6vBSvXTA7FQy
4KIAoKqfwYh9h227ud1lPe+Xgbxj46Nb
=bg0l
-----END PGP SIGNATURE-----

>From 7209a1fc4f447a2b64f0e0237fd23f77ee65acb0 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 4 Nov 2008 06:23:00 -0700
Subject: [PATCH] Upgrade to FDL 1.3.

* cfg.mk (fetch): Add fdl-1.3.texi.
* .gitattributes: Likewise.
* doc/autoconf.texi (GNU Free Documentation License): Point to new
upstream version.
* doc/Makefile.am (autoconf_TEXINFOS): Likewise.
(standards_TEXINFOS): Mention current dependence on older license.
* doc/fdl-1.3.texi: New upstream file.
* GNUmakefile: Resync from upstream.
* build-aux/announce-gen: Likewise.
* build-aux/texinfo.tex: Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 .gitattributes         |    1 +
 ChangeLog              |   15 ++
 GNUmakefile            |    8 +-
 build-aux/announce-gen |   12 +-
 build-aux/texinfo.tex  |   80 ++++++--
 cfg.mk                 |    1 +
 doc/Makefile.am        |    4 +-
 doc/autoconf.texi      |    2 +-
 doc/fdl-1.3.texi       |  506 ++++++++++++++++++++++++++++++++++++++++++++++++
 10 files changed, 622 insertions(+), 32 deletions(-)
 create mode 100644 doc/fdl-1.3.texi

diff --git a/.gitattributes b/.gitattributes
index 621e75b..82752b0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,5 +9,6 @@ mdate-sh        -whitespace
 missing                -whitespace
 texinfo.tex    -whitespace
 fdl.texi       -whitespace
+fdl-1.3.texi   -whitespace
 make-stds.texi -whitespace
 standards.texi -whitespace
diff --git a/ChangeLog b/ChangeLog
index 9024ea0..b2e98fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-11-04  Eric Blake  <address@hidden>
+
+       Upgrade to FDL 1.3.
+       * cfg.mk (fetch): Add fdl-1.3.texi.
+       * .gitattributes: Likewise.
+       * doc/autoconf.texi (GNU Free Documentation License): Point to new
+       upstream version.
+       * doc/Makefile.am (autoconf_TEXINFOS): Likewise.
+       (standards_TEXINFOS): Mention current dependence on older license.
+       * doc/fdl-1.3.texi: New upstream file.
+       * GNUmakefile: Resync from upstream.
+       * build-aux/announce-gen: Likewise.
+       * build-aux/texinfo.tex: Likewise.
+       * doc/standards.texi: Likewise.
+
 2008-11-03  Ralf Wildenhues  <address@hidden>
 
        Point at AM_SUBST_NOTMAKE.
diff --git a/GNUmakefile b/GNUmakefile
index 7816416..0fdd3fa 100644
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 385ce8c..6775665 100755
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index bac0726..1901d68 100644
diff --git a/cfg.mk b/cfg.mk
index c4bbb4f..d5db0b7 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -57,6 +57,7 @@ fetch:
        cp $(gnulib_dir)/build-aux/vc-list-files $(srcdir)/build-aux
        cp $(gnulib_dir)/build-aux/texinfo.tex $(srcdir)/build-aux
        cp $(gnulib_dir)/doc/fdl.texi $(srcdir)/doc
+       cp $(gnulib_dir)/doc/fdl-1.3.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/make-stds.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/standards.texi $(srcdir)/doc
        cp $(gnulib_dir)/top/GNUmakefile $(srcdir)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0744add..a823959 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,8 +21,8 @@ TEXI2HTML_FLAGS = -split_chapter
 TEXINFO_TEX = ../build-aux/texinfo.tex
 
 info_TEXINFOS = autoconf.texi standards.texi
-autoconf_TEXINFOS = fdl.texi install.texi
-standards_TEXINFOS = make-stds.texi
+autoconf_TEXINFOS = fdl-1.3.texi install.texi
+standards_TEXINFOS = fdl.texi make-stds.texi
 
 # Files from texi2dvi that should be removed, but which Automake does
 # not know.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 20fd9a0..bc46d77 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -22483,7 +22483,7 @@ Deuteronomy
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 
address@hidden fdl.texi
address@hidden fdl-1.3.texi
 
 @node Indices
 @appendix Indices
diff --git a/doc/fdl-1.3.texi b/doc/fdl-1.3.texi
new file mode 100644
index 0000000..8805f1a
-- 
1.6.0.2