Re: Upgrade to FDL-1.3

[Eric Blake]

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

According to Eric Blake on 11/10/2008 4:09 PM:
> From: Eric Blake <address@hidden>
> Date: Mon, 10 Nov 2008 16:06:59 -0700
> Subject: [PATCH] Yet more FDL 1.3 fallout.
> 
> * NEWS: Mention manual license change.

Hopefully this is settled, now.  Karl preferred that upstream
standards.texi refer to just fdl.texi, so I made everything else follow
suit (once gnulib/doc/fdl.texi was altered to be a symlink to fdl-1.3.texi).

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

iEYEARECAAYFAkkY8IAACgkQ84KuGfSFAYDjLQCg2VHbQoBK/ZA0mnEEFRjAyaI6
A7gAnifRwqych14x0pyg7ukIX+/7xFSE
=2qgn
-----END PGP SIGNATURE-----

>From 5bf2204ddb1cd6f4430ed6f76ad7eb6de4d0d470 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 10 Nov 2008 19:38:05 -0700
Subject: [PATCH] Match upstream standards.texi.

* doc/standards.texi: Resync from upstream.
* doc/fdl-1.3.texi: Rename...
* doc/fdl.texi: ...to this.
* doc/Makefile.am (autoconf_TEXINFOS, standards_TEXINFOS): Update
users.
* doc/autoconf.texi (GNU Free Documentation License): Likewise.
* cfg.mk (fetch): Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog                      |    9 +++++++++
 cfg.mk                         |    2 +-
 doc/Makefile.am                |    4 ++--
 doc/autoconf.texi              |    2 +-
 doc/{fdl-1.3.texi => fdl.texi} |    0
 doc/standards.texi             |    4 ++--
 6 files changed, 15 insertions(+), 6 deletions(-)
 rename doc/{fdl-1.3.texi => fdl.texi} (100%)

diff --git a/ChangeLog b/ChangeLog
index 8a06cbf..2367c7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-11-10  Eric Blake  <address@hidden>
 
+       Match upstream standards.texi.
+       * doc/standards.texi: Resync from upstream.
+       * doc/fdl-1.3.texi: Rename...
+       * doc/fdl.texi: ...to this.
+       * doc/Makefile.am (autoconf_TEXINFOS, standards_TEXINFOS): Update
+       users.
+       * doc/autoconf.texi (GNU Free Documentation License): Likewise.
+       * cfg.mk (fetch): Likewise.
+
        Yet more FDL 1.3 fallout.
        * NEWS: Mention manual license change.
 
diff --git a/cfg.mk b/cfg.mk
index 8e7901b..2d6ce99 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -56,7 +56,7 @@ fetch:
        cp $(gnulib_dir)/build-aux/missing $(srcdir)/build-aux
        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-1.3.texi $(srcdir)/doc
+       cp $(gnulib_dir)/doc/fdl.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/gnu-oids.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/make-stds.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/standards.texi $(srcdir)/doc
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4f51061..38abc5f 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-1.3.texi install.texi
-standards_TEXINFOS = fdl-1.3.texi gnu-oids.texi make-stds.texi
+autoconf_TEXINFOS = fdl.texi install.texi
+standards_TEXINFOS = fdl.texi gnu-oids.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 fbb0a3b..34611b8 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -22559,7 +22559,7 @@ Deuteronomy
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 
address@hidden fdl-1.3.texi
address@hidden fdl.texi
 
 @node Indices
 @appendix Indices
diff --git a/doc/fdl-1.3.texi b/doc/fdl.texi
similarity index 100%
rename from doc/fdl-1.3.texi
rename to doc/fdl.texi
diff --git a/doc/standards.texi b/doc/standards.texi
index 97d25d1..bd90a92 100644
--- a/doc/standards.texi
+++ b/doc/standards.texi
@@ -3,7 +3,7 @@
 @setfilename standards.info
 @settitle GNU Coding Standards
 @c This date is automagically updated when you save this file:
address@hidden lastupdate November 10, 2008
address@hidden lastupdate November 6, 2008
 @c %**end of header
 
 @dircategory GNU organization
@@ -4196,7 +4196,7 @@ GNU Free Documentation License
 @appendix GNU Free Documentation License
 
 @cindex FDL, GNU Free Documentation License
address@hidden fdl-1.3.texi
address@hidden fdl.texi
 
 @node Index
 @unnumbered Index
-- 
1.6.0.2