r5730 - in trunk/BOOK: . introduction/welcome kde/add kde/core kde/devel xincludes

randy at linuxfromscratch.org randy at linuxfromscratch.org
Thu Mar 16 08:24:29 PST 2006


Author: randy
Date: 2006-03-16 09:24:25 -0700 (Thu, 16 Mar 2006)
New Revision: 5730

Added:
   trunk/BOOK/xincludes/
   trunk/BOOK/xincludes/kde-apidocs.xml
   trunk/BOOK/xincludes/kde-sysconfdir.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/kde/add/kdegames.xml
   trunk/BOOK/kde/add/kdegraphics.xml
   trunk/BOOK/kde/add/kdemultimedia.xml
   trunk/BOOK/kde/add/kdepim.xml
   trunk/BOOK/kde/core/kdebase.xml
   trunk/BOOK/kde/core/kdelibs.xml
   trunk/BOOK/kde/devel/kdevelop.xml
Log:
Created two XInclude files to replace instances of identical text in several KDE packages

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-03-16 07:33:07 UTC (rev 5729)
+++ trunk/BOOK/general.ent	2006-03-16 16:24:25 UTC (rev 5730)
@@ -1,4 +1,4 @@
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -565,6 +565,7 @@
 <!ENTITY cdrdao-version               "1.2.1">
 <!ENTITY udftools-version             "1.0.0b3">
 <!ENTITY dvd-rw-tools-version         "6.1">
+<!ENTITY k3b-version                  "0.12.14">
 
 <!-- Part XII -->
 <!-- Chapter 42 -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-03-16 07:33:07 UTC (rev 5729)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -42,6 +42,16 @@
 -->
 
     <listitem>
+      <para>March 16th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Created two XInclude files to replace instances of
+          identical text in several KDE packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 15th, 2006</para>
       <itemizedlist>
         <listitem>
@@ -122,7 +132,7 @@
     </listitem>
 
     <listitem>
-      <para>March 3rd, 2006</para>
+      <para>March 4th, 2006</para>
       <itemizedlist>
         <listitem>
           <para>[dj] - Updated JDK to account for Xorg-7.0.0.</para>
@@ -130,9 +140,8 @@
       </itemizedlist>
     </listitem>
 
-
     <listitem>
-      <para>March 2nd, 2006</para>
+      <para>March 3rd, 2006</para>
       <itemizedlist>
         <listitem>
           <para>[dj] - Updated Xorg-7 and Mesa to use alternate module

Modified: trunk/BOOK/kde/add/kdegames.xml
===================================================================
--- trunk/BOOK/kde/add/kdegames.xml	2006-03-16 07:33:07 UTC (rev 5729)
+++ trunk/BOOK/kde/add/kdegames.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -82,14 +82,17 @@
     --disable-dependency-tracking &&
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation
       and you have <application>Doxygen</application> and
       <application>GraphViz</application> installed, <command>make
       apidox</command> must be done before <command>make
       install</command>.</para>
-    </note>
+    </note> -->
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>

Modified: trunk/BOOK/kde/add/kdegraphics.xml
===================================================================
--- trunk/BOOK/kde/add/kdegraphics.xml	2006-03-16 07:33:07 UTC (rev 5729)
+++ trunk/BOOK/kde/add/kdegraphics.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -113,13 +113,16 @@
     --disable-dependency-tracking &&
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation and you have
       <application>Doxygen</application> and <application>GraphViz</application>
       installed, <command>make apidox</command> must be done before
       <command>make install</command>.</para>
-    </note>
+    </note> -->
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&

Modified: trunk/BOOK/kde/add/kdemultimedia.xml
===================================================================
--- trunk/BOOK/kde/add/kdemultimedia.xml	2006-03-16 07:33:07 UTC (rev 5729)
+++ trunk/BOOK/kde/add/kdemultimedia.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -229,11 +229,14 @@
 
     <para>Install <application>kdemultimedia</application> with:</para>
 
-    <note>
-      <para> The --sysconfdir parameter must be the same as command used in
+    <!-- <note>
+      <para> The -\-sysconfdir parameter must be the same as command used in
       kdelibs.</para>
-    </note>
+    </note> -->
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-sysconfdir.xml"/>
+
 <screen><userinput>patch -Np1 -i ../kdemultimedia-&kde-version;-libtunepimp_0.4.x-1.patch &&
 ./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
     --disable-debug --disable-dependency-tracking &&

Modified: trunk/BOOK/kde/add/kdepim.xml
===================================================================
--- trunk/BOOK/kde/add/kdepim.xml	2006-03-16 07:33:07 UTC (rev 5729)
+++ trunk/BOOK/kde/add/kdepim.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -101,14 +101,17 @@
     --disable-dependency-tracking &&
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation and
       you have <application>Doxygen</application> and
       <application>GraphViz</application> installed,
       <command>make apidox</command> must be done before
       <command>make install</command>.</para>
-    </note>
+    </note> -->
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>

Modified: trunk/BOOK/kde/core/kdebase.xml
===================================================================
--- trunk/BOOK/kde/core/kdebase.xml	2006-03-16 07:33:07 UTC (rev 5729)
+++ trunk/BOOK/kde/core/kdebase.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -112,22 +112,28 @@
 
     <para>Install <application>kdebase</application> with:</para>
 
-    <note>
-      <para>The <parameter>--sysconfdir</parameter> parameter must be
+    <!-- <note>
+      <para>The <parameter>-\-sysconfdir</parameter> parameter must be
       the same as the command used in <application>kdelibs</application>.</para>
-    </note>
+    </note> -->
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-sysconfdir.xml"/>
+
 <screen><userinput>./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
     --disable-debug --disable-dependency-tracking &&
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation and you have
       <application>Doxygen</application> and <application>GraphViz</application>
       installed, <command>make apidox</command> must be done before
       <command>make install</command>.</para>
-    </note>
+    </note> -->
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role='root'><userinput>make install</userinput></screen>

Modified: trunk/BOOK/kde/core/kdelibs.xml
===================================================================
--- trunk/BOOK/kde/core/kdelibs.xml	2006-03-16 07:33:07 UTC (rev 5729)
+++ trunk/BOOK/kde/core/kdelibs.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -107,7 +107,8 @@
 
   </sect2>
 
-  <sect2 role="installation">
+  <sect2 role="installation" id="kdelibs-install"
+         xreflabel="the installation of kdelibs">
     <title>Installation of Kdelibs</title>
 
     <para>Install <application>kdelibs</application> with:</para>

Modified: trunk/BOOK/kde/devel/kdevelop.xml
===================================================================
--- trunk/BOOK/kde/devel/kdevelop.xml	2006-03-16 07:33:07 UTC (rev 5729)
+++ trunk/BOOK/kde/devel/kdevelop.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -85,19 +85,26 @@
     --disable-dependency-tracking &&
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation and you have
       <application>Doxygen</application> and <application>GraphViz</application>
       installed, <command>make apidox</command> must be done before
       <command>make install</command>. You'll also need to run <command>make
       install-apidox</command> to install the API documentation.</para>
-    </note>
+    </note> -->
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&
 chown -v -R root:root &kde-dir;/kdevbdb</userinput></screen>
 
+    <para>If you created the API documentation, install it with:</para>
+
+<screen role="root"><userinput>make install-apidox</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">

Added: trunk/BOOK/xincludes/kde-apidocs.xml
===================================================================
--- trunk/BOOK/xincludes/kde-apidocs.xml	                        (rev 0)
+++ trunk/BOOK/xincludes/kde-apidocs.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
+
+<note>
+  <para>If you wish to create the API documentation and you have
+  <application>Doxygen</application> and
+  <application>GraphViz</application> installed,
+  <command>make apidox</command> must be done before
+  <command>make install</command>.</para>
+</note>

Added: trunk/BOOK/xincludes/kde-sysconfdir.xml
===================================================================
--- trunk/BOOK/xincludes/kde-sysconfdir.xml	                        (rev 0)
+++ trunk/BOOK/xincludes/kde-sysconfdir.xml	2006-03-16 16:24:25 UTC (rev 5730)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
+
+<note>
+  <para>The <parameter>--sysconfdir</parameter> parameter must be the
+  same as the command used in <xref linkend="kdelibs-install"/>.</para>
+</note>




More information about the blfs-book mailing list