From f8b41d7b8ffab0f45431c56961500e203ab0c0f8 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 14 Mar 2011 22:10:23 +0000
Subject: Upgrade to Dejagnu-1.5. Fixes #2845.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9489 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 8 +++++---
 chapter03/patches.xml   | 8 --------
 chapter05/dejagnu.xml   | 5 -----
 packages.ent            | 6 +++---
 patches.ent             | 4 ----
 6 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index dad984940..9ef0533e5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2011-03-14</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Dejagnu-1.5. Fixes
+          <ulink url="&lfs-ticket-root;2845">#2845</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Add patch to fix the sparse-fiemap test failure in
           Coreutils-8.10.  Thanks to Tadeus (Eus) Prastowo for the report and
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 66cc8d2ef..a173992c1 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -49,9 +49,9 @@
     <!--<listitem>
       <para>Coreutils &coreutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>DejaGNU &dejagnu-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
@@ -231,7 +231,9 @@
 
   <itemizedlist>
     <title>Removed:</title>
-    <listitem><para></para></listitem>  <!-- satisfy build -->
+    <listitem>
+      <para>dejagnu-1.4.4-consolidated-1.patch</para>
+    </listitem>
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 81e1e54ef..e420e8f4b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -58,14 +58,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Dejagnu Consolidated Patch - <token>&dejagnu-consolidated-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&dejagnu-consolidated-patch;"/></para>
-        <para>MD5 sum: <literal>&dejagnu-consolidated-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Flex GCC-4.4.x Patch - <token>&flex-gcc-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index 8f097e816..bae0ed7d9 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -41,11 +41,6 @@
   <sect2 role="installation">
     <title>Installation of DejaGNU</title>
 
-    <para>The most recent version of this package was released in 2004.  Apply
-    some fixes that have accumulated since then:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&dejagnu-consolidated-patch;</userinput></screen>
-
     <para>Prepare DejaGNU for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
diff --git a/packages.ent b/packages.ent
index db78edbcc..e52cdf4dd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -78,10 +78,10 @@
 <!ENTITY coreutils-ch6-du "99 MB">
 <!ENTITY coreutils-ch6-sbu "3.2 SBU">
 
-<!ENTITY dejagnu-version "1.4.4">
-<!ENTITY dejagnu-size "1,055 KB">
+<!ENTITY dejagnu-version "1.5">
+<!ENTITY dejagnu-size "563 KB">
 <!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-<!ENTITY dejagnu-md5 "053f18fd5d00873de365413cab17a666">
+<!ENTITY dejagnu-md5 "3df1cbca885e751e22d3ebd1ac64dc3c">
 <!ENTITY dejagnu-home "&gnu-software;dejagnu/">
 <!ENTITY dejagnu-ch5-du "6.1 MB">
 <!ENTITY dejagnu-ch5-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 84bf01d78..777b08ddd 100644
--- a/patches.ent
+++ b/patches.ent
@@ -24,10 +24,6 @@
 <!ENTITY coreutils-uname-patch-md5 "500481b75892e5c07e19e9953a690e54">
 <!ENTITY coreutils-uname-patch-size "1.6 KB">
 
-<!ENTITY dejagnu-consolidated-patch "dejagnu-&dejagnu-version;-consolidated-1.patch">
-<!ENTITY dejagnu-consolidated-patch-md5 "b9949a8abcc210d1dc9cdda06821c199">
-<!ENTITY dejagnu-consolidated-patch-size "6 KB">
-
 
 <!ENTITY diffutils-i18n-patch "diffutils-&diffutils-version;-i18n-1.patch">
 <!ENTITY diffutils-i18n-patch-md5 "c8d481223db274a33b121fb8c25af9f7">
-- 
cgit v1.2.3-54-g00ecf