From ecc9bebb6a96ac080e8b7f50d1c5bae5c4df6ea1 Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Wed, 5 Jan 2005 14:18:58 +0000
Subject: [PATCH] Upgrade to Texinfo 4.8

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4488 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter03/patches.xml   | 6 ------
 chapter06/texinfo.xml   | 4 ----
 general.ent             | 6 +++---
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1106e6e17..8d13b4d3f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -31,6 +31,7 @@ of the LFS Book.</para>
 <listitem><para>sysvinit-2.86</para></listitem>
 <listitem><para>tar-1.15.1</para></listitem>
 <listitem><para>tcl-8.4.9</para></listitem>
+<listitem><para>texinfo-4.8</para></listitem>
 <listitem><para>udev-050</para></listitem>
 <listitem><para>util-linux-2.12p</para></listitem>
 </itemizedlist>
@@ -47,9 +48,12 @@ of the LFS Book.</para>
 <listitem><para>Removed:</para>
 <itemizedlist>
 <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
+<listitem><para>texinfo-4.7-segfault-1.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
+<listitem><para>January 5th, 2005 [jeremy]: Upgraded to Texinfo 4.8</para></listitem>
+
 <listitem><para>December 31st, 2004 [jeremy]: Oops - forgot to remove the
 separate targets for hotplug and syslog-ng - fixed.</para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f2d430e5b..a0176077b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -142,12 +142,6 @@ following:</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>Texinfo Seg-Fault Patch - 1 KB:</term> <listitem>
-<para><ulink url="&patches-root;texinfo-&texinfo-version;-segfault-1.patch"/></para>
-</listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Util-linux Cramfs Patch - 2kb:</term> <listitem>
 <para><ulink url="&patches-root;util-linux-&util-linux-version;-cramfs-1.patch"/></para>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 40bf18ccd..32e941be2 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -22,10 +22,6 @@
 <sect2 role="installation">
 <title>Installation of Texinfo</title>
 
-<para>Apply a patch:</para>
-
-<screen><userinput>patch -Np1 -i ../texinfo-&texinfo-version;-segfault-1.patch</userinput></screen>
-
 <para>Prepare Texinfo for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
diff --git a/general.ent b/general.ent
index bfd1b2c19..5c803d934 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20041231">
-<!ENTITY releasedate "December 31, 2004">
+<!ENTITY version "SVN-20050105">
+<!ENTITY releasedate "January 5, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -66,7 +66,7 @@
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY tar-version "1.15.1">
 <!ENTITY tcl-version "8.4.9">
-<!ENTITY texinfo-version "4.7">
+<!ENTITY texinfo-version "4.8">
 <!ENTITY util-linux-version "2.12p">
 <!ENTITY udev-version "050">
 <!ENTITY vim-version "6.3">