r8746 - in trunk/BOOK: . introduction/welcome pst/sgml

ken at linuxfromscratch.org ken at linuxfromscratch.org
Sat Jan 1 17:19:06 PST 2011


Author: ken
Date: 2011-01-01 18:18:59 -0700 (Sat, 01 Jan 2011)
New Revision: 8746

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/sgml/docbook-utils.xml
Log:
Fix docbook-utils so that the scripts work with grep-2.7.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2011-01-01 16:26:41 UTC (rev 8745)
+++ trunk/BOOK/general.ent	2011-01-02 01:18:59 UTC (rev 8746)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY day          "02">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "January &day;st, &year;">
+<!ENTITY releasedate  "January &day;nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2011-01-01 16:26:41 UTC (rev 8745)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2011-01-02 01:18:59 UTC (rev 8746)
@@ -42,6 +42,18 @@
 -->
 
     <listitem>
+      <para>January 2nd, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - patch the docbook-utils jw script so that it uses
+          correct grep syntax, so that programs such as docbook2man do not
+          fail when grep-2.7 is used during the compilation of other
+          packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 1st, 2011</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/pst/sgml/docbook-utils.xml
===================================================================
--- trunk/BOOK/pst/sgml/docbook-utils.xml	2011-01-01 16:26:41 UTC (rev 8745)
+++ trunk/BOOK/pst/sgml/docbook-utils.xml	2011-01-02 01:18:59 UTC (rev 8746)
@@ -37,7 +37,8 @@
     two SGML files and only display the differences in markup. This is useful
     for comparing documents prepared for different languages.</para>
 
-    &lfs65_checked;
+    &lfs67_checked;
+    <para>&lfssvn_checked;20101229&lfssvn_checked2;</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -61,6 +62,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch: <ulink
+        url="&patch-root;/docbook-utils-&docbook-utils-version;-grep_fix-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">DocBook-utils Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -113,7 +122,9 @@
     <para>Install <application>DocBook-utils</application> by running the
     following commands:</para>
 
-<screen><userinput>sed -i 's:/html::' doc/HTML/Makefile.in &&
+<screen><userinput>
+patch -Np1 -i ../docbook-utils-&docbook-utils-version;-grep_fix-1.patch &&
+sed -i 's:/html::' doc/HTML/Makefile.in &&
 ./configure --prefix=/usr &&
 make</userinput></screen>
 
@@ -144,6 +155,11 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>patch -Np1 -i ../docbook-utils-&docbook-utils-version;-grep_fix-1.patch</command>:
+    This patch corrects the syntax in the jw (Jade Wrapper) script which is at
+    the heart of much db2* processing, so that the current version of
+    <application>Grep</application> will not reject it.</para>
+
     <para><command>sed -i 's:/html::' doc/HTML/Makefile.in</command>:
     This command changes the installation directory of the HTML documents.</para>
 




More information about the blfs-book mailing list