From 9e34c5f049652c76575792581b3222f13c8a6097 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 12 Mar 2005 14:46:36 +0000
Subject: * Upgrade to psmisc-21.6

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4732 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 3 +++
 chapter03/packages.xml  | 2 +-
 chapter06/psmisc.xml    | 9 +++------
 general.ent             | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 84307c6a0..974fc08a1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>Module-init-tools 3.1</para></listitem>
 <listitem><para>Perl 5.8.6</para></listitem>
 <listitem><para>Procps 3.2.5</para></listitem>
+<listitem><para>Psmisc 21.6</para></listitem>
 <listitem><para>Sed 4.1.4</para></listitem>
 <listitem><para>Shadow 4.0.7</para></listitem>
 <listitem><para>Sysvinit 2.86</para></listitem>
@@ -81,6 +82,8 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>March 12, 2005 [matt]: Upgraded psmisc to 21.6</para></listitem>
+
 <listitem><para>March 10, 2005 [matt]: gettext no longer installs
 libgettext{lib,src}.a (Jack Brown)</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 4f20e426f..666f4d1e9 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -326,7 +326,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Psmisc (&psmisc-version;) - 374 KB:</term>
+<term>Psmisc (&psmisc-version;) - 217 KB:</term>
 <listitem>
 <para><ulink url="&sourceforge;psmisc/"/></para>
 </listitem>
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index b463eae8c..7d382e227 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -16,7 +16,7 @@ processes.</para>
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>2.2 MB</seg></seglistitem>
+<seglistitem><seg>0.1 SBU</seg><seg>1.5 MB</seg></seglistitem>
 </segmentedlist>
 
 <segmentedlist>
@@ -58,12 +58,9 @@ mounted.</para></listitem>
 <para>There is no reason for the <command>pstree</command> and
 <command>pstree.x11</command> programs to reside in <filename
 class="directory">/bin</filename>. Therefore, move them to <filename
-class="directory">/usr/bin</filename>. Also, there is no need for
-<command>pstree.x11</command> to exist as a separate program. Make it
-a symbolic link to <command>pstree</command> instead:</para>
+class="directory">/usr/bin</filename>:</para>
 
-<screen><userinput>mv /bin/pstree* /usr/bin
-ln -sf pstree /usr/bin/pstree.x11</userinput></screen>
+<screen><userinput>mv /bin/pstree* /usr/bin</userinput></screen>
 
 <para>By default, Psmisc's <command>pidof</command> program is not
 installed. This usually is not a problem because it is installed later
diff --git a/general.ent b/general.ent
index 92ca8305a..f0dad39de 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20050310">
-<!ENTITY releasedate "March 10, 2005">
+<!ENTITY version "SVN-20050312">
+<!ENTITY releasedate "March 12, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -66,7 +66,7 @@
 <!ENTITY patch-version "2.5.4">
 <!ENTITY perl-version "5.8.6">
 <!ENTITY procps-version "3.2.5">
-<!ENTITY psmisc-version "21.5">
+<!ENTITY psmisc-version "21.6">
 <!ENTITY readline-version "5.0">
 <!ENTITY sed-version "4.1.4">
 <!ENTITY shadow-version "4.0.7">
-- 
cgit v1.2.3-54-g00ecf