r6724 - in trunk/BOOK: . general/sysutils introduction/welcome

[alexander]

Author: alexander
Date: 2007-04-13 09:47:20 -0600 (Fri, 13 Apr 2007)
New Revision: 6724

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/sysutils/hal.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Reverted r6723 for now due to Randy's objections

Modified: trunk/BOOK/general/sysutils/hal.xml
===================================================================
--- trunk/BOOK/general/sysutils/hal.xml 2007-04-13 08:24:07 UTC (rev 6723)
+++ trunk/BOOK/general/sysutils/hal.xml 2007-04-13 15:47:20 UTC (rev 6724)
@@ -70,7 +70,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="glib2"/>,
-    <xref linkend="dbus"/> (see the <xref linkend="hal-requirements"/>), and
+    <xref linkend="dbus"/> (see the <xref linkend="hal-requirements"/>),
+    <xref linkend="python"/>, and
     <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -81,7 +82,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="pkgconfig"/>,
-    <xref linkend="python"/>,
     <xref linkend="intltool"/>,
     <xref linkend="libusb"/>,
     <xref linkend="doxygen"/>, and
@@ -108,21 +108,9 @@
 useradd -c "HAL Daemon User" -d /dev/null -u 19 \
         -g haldaemon -s /bin/false haldaemon</userinput></screen>
 
-    <para>If you don't have <application>Python</application> installed,
-    suppress the installation of <command>hal-device-manager</command> and
-    the compile-time check for <application>Python</application>:</para>
+    <para>Install <application>HAL</application> by running the following
+    commands:</para>
 
-<screen><userinput>sed -i 's/device-manager//g' tools/Makefile.in &amp;&amp;
-PYTHON=false ./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/hal \
-            --localstatedir=/var &amp;&amp;
-make
-</userinput></screen>
-
-    <para>Otherwise, install <application>HAL</application> by running the
-    following commands:</para>
-
 <screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
             --libexecdir=/usr/lib/hal \

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2007-04-13 08:24:07 UTC (rev 6723)
+++ trunk/BOOK/general.ent      2007-04-13 15:47:20 UTC (rev 6724)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "13">                   <!-- Always 2 digits -->
+<!ENTITY day          "10">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2007-04-13 08:24:07 UTC 
(rev 6723)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2007-04-13 15:47:20 UTC 
(rev 6724)
@@ -42,16 +42,6 @@
 -->
 
     <listitem>
-      <para>April 13th, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[alexander] - Circumvented the previously-required
-          dependency of HAL on Python.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
       <para>April 10th, 2007</para>
       <itemizedlist>
         <listitem>

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page