Re: Upgrade to FDL-1.3

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

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

Done as follows:

From: Eric Blake <address@hidden>
Date: Mon, 10 Nov 2008 11:09:54 -0700
Subject: [PATCH] More FDL 1.3 fallout.

* cfg.mk (fetch): Add gnu-oids.texi, drop fdl.texi.
* doc/Makefile.am (standards_TEXINFOS): Reflect upstream
dependency changes.
* doc/fdl.texi: Delete.
* doc/gnu-oids.texi: New upstream file.
* doc/standards.texi: Resync from upstream.
* doc/make-stds.texi: Likewise.
* build-aux/announce-gen: Likewise.
* build-aux/texinfo.tex: Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog              |   13 ++
 build-aux/announce-gen |    2 +-
 build-aux/texinfo.tex  |   81 ++++++---
 cfg.mk                 |    2 +-
 doc/Makefile.am        |    2 +-
 doc/fdl.texi           |  451 ------------------------------------------------
 doc/gnu-oids.texi      |   47 +++++
 doc/make-stds.texi     |    8 +-
 doc/standards.texi     |   38 ++++-
 9 files changed, 153 insertions(+), 491 deletions(-)
 delete mode 100644 doc/fdl.texi
 create mode 100644 doc/gnu-oids.texi

diff --git a/ChangeLog b/ChangeLog
index b0988e4..58b98ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-11-10  Eric Blake  <address@hidden>
+
+       More FDL 1.3 fallout.
+       * cfg.mk (fetch): Add gnu-oids.texi, drop fdl.texi.
+       * doc/Makefile.am (standards_TEXINFOS): Reflect upstream
+       dependency changes.
+       * doc/fdl.texi: Delete.
+       * doc/gnu-oids.texi: New upstream file.
+       * doc/standards.texi: Resync from upstream.
+       * doc/make-stds.texi: Likewise.
+       * build-aux/announce-gen: Likewise.
+       * build-aux/texinfo.tex: Likewise.
+
 2008-11-10  Clinton Roy  <address@hidden>  (tiny change)
 
        Pass autoreconf -I to aclocal -I
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 6775665..78ca625 100755
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 1901d68..fb83ce5 100644
diff --git a/cfg.mk b/cfg.mk
index d5db0b7..8e7901b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -56,8 +56,8 @@ 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.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/fdl-1.3.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
        cp $(gnulib_dir)/top/GNUmakefile $(srcdir)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a823959..4f51061 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,7 +22,7 @@ TEXINFO_TEX = ../build-aux/texinfo.tex
 
 info_TEXINFOS = autoconf.texi standards.texi
 autoconf_TEXINFOS = fdl-1.3.texi install.texi
-standards_TEXINFOS = fdl.texi make-stds.texi
+standards_TEXINFOS = fdl-1.3.texi gnu-oids.texi make-stds.texi
 
 # Files from texi2dvi that should be removed, but which Automake does
 # not know.
diff --git a/doc/fdl.texi b/doc/fdl.texi
deleted file mode 100644
index 96ce74e..0000000
diff --git a/doc/gnu-oids.texi b/doc/gnu-oids.texi
new file mode 100644
index 0000000..9dedcf1
diff --git a/doc/make-stds.texi b/doc/make-stds.texi
index bd4df50..055996e 100644
diff --git a/doc/standards.texi b/doc/standards.texi
index 7520591..97d25d1 100644
-- 
1.6.0.2