Current BE-LFS (but w/ GCC 3.3.3) merged -> 6.0 branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3445 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 24 insertions, 10 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d152c2a3e..3bf2f6dd1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -21,20 +21,23 @@ first a summary, then a detailed log.</para>
 <itemizedlist>
 <listitem><para>autoconf-2.59</para></listitem>
 <listitem><para>automake-1.8.4</para></listitem>
+<listitem><para>binutils-2.15.90.0.3</para></listitem>
+<listitem><para>bison-1.875a</para></listitem>
 <listitem><para>coreutils-5.2.1</para></listitem>
 <listitem><para>e2fsprogs-1.35</para></listitem>
 <listitem><para>expect-5.41.0</para></listitem>
 <listitem><para>file-4.09</para></listitem>
+<listitem><para>flex-2.5.31</para></listitem>
 <listitem><para>gcc-3.3.3</para></listitem>
 <listitem><para>gettext-0.14.1</para></listitem>
+<listitem><para>glibc-2.3.4-20040408</para></listitem>
 <listitem><para>grub-0.94</para></listitem>
 <listitem><para>kbd-1.12</para></listitem>
 <listitem><para>less-382</para></listitem>
 <listitem><para>lfs-bootscripts-2.0.4</para></listitem>
 <listitem><para>libtool-2.5.6</para></listitem>
-<listitem><para>linux-2.4.26</para></listitem>
+<listitem><para>linux-2.6.5</para></listitem>
 <listitem><para>man-pages-1.66</para></listitem>
-<listitem><para>modutils-2.4.27</para></listitem>
 <listitem><para>ncurses-5.4</para></listitem>
 <listitem><para>perl-5.8.4</para></listitem>
 <listitem><para>procps-3.2.1</para></listitem>
@@ -50,29 +53,45 @@ first a summary, then a detailed log.</para>
 
 <listitem><para>Added:</para>
 <itemizedlist>
+<listitem><para>flex-2.5.31-debian-fixes-2.patch</para></listitem>
 <listitem><para>iana-etc-1.00</para></listitem>
+<listitem><para>inetutils-1.4.2-kernel-headers-1.patch</para></listitem>
 <listitem><para>inetutils-1.4.2-no_server_man_pages-1.patch</para></listitem>
-<listitem><para>make_devices-1.2</para></listitem>
-<listitem><para>mktemp-1.5 + mktemp-1.5-add-tempfile.patch</para></listitem>
+<listitem><para>linux-libc-headers-2.6.5.1</para></listitem>
+<listitem><para>mktemp-1.5</para></listitem>
+<listitem><para>mktemp-1.5-add-tempfile-1.patch</para></listitem>
+<listitem><para>module-init-tools-3.0</para></listitem>
+<listitem><para>net-tools-1.60-kernel-headers-1.patch</para></listitem>
+<listitem><para>sysklogd-1.4.1-kernel-headers-1.patch</para></listitem>
+<listitem><para>udev-025</para></listitem>
+<listitem><para>udev-025-config-1.patch</para></listitem>
+<listitem><para>util-linux-2.12a-kernel-headers-1.patch</para></listitem>
 </itemizedlist>
 </listitem>
  
 <listitem><para>Removed:</para>
 <itemizedlist>
+<listitem><para>bison-1.875-attribute.patch</para></listitem>
+<listitem><para>ed-0.2</para></listitem>
+<listitem><para>gcc-2.95.3</para></listitem>
 <listitem><para>gcc-3.3.1-suppress-libiberty.patch</para></listitem>
+<listitem><para>kbd-1.12-more-programs-1.patch</para></listitem>
 <listitem><para>lfs-utils-0.5</para></listitem>
 <listitem><para>MAKEDEV-1.7</para></listitem>
 <listitem><para>man-1.5m2-manpath.patch</para></listitem>
 <listitem><para>man-1.5m2-pager.patch</para></listitem>
+<listitem><para>modutils-2.4.25</para></listitem>
 <listitem><para>ncurses-5.3-etip-2.patch</para></listitem>
 <listitem><para>ncurses-5.3-vsscanf.patch</para></listitem>
-<listitem><para>perl-5.8.0-libc-3.patch</para></listitem>
+<listitem><para>procinfo-18</para></listitem>
 <listitem><para>procps-3.1.11-locale-fix.patch</para></listitem>
 <listitem><para>shadow-4.0.3-newgrp-fix.patch</para></listitem>
 <listitem><para>zlib-1.1.4-vsnprintf.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
+<listitem><para>May 3rd, 2004 [winkie]: Merged BE-LFS content.</para></listitem>
+
 <listitem><para>May 2nd, 2004 [matt]: Quoted chroot commands in chapter 6 (bug
 #818).</para></listitem>
 <listitem><para>May 2nd, 2004 [matt]: Removed description of the now
diff --git a/chapter01/chapter01.xml b/chapter01/chapter01.xml
index 0698615df..2090daa0e 100644
--- a/chapter01/chapter01.xml
+++ b/chapter01/chapter01.xml
@@ -9,13 +9,8 @@
 <?dbhtml filename="chapter01.html"?>
 
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="how.xml"/>
-
-
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="changelog.xml"/>
-
-
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="administrativa.xml"/>
-
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="askforhelp.xml"/>
 
 </chapter>