Author: thomas
Date: 2011-03-19 12:19:07 -0600 (Sat, 19 Mar 2011)
New Revision: 8870

Modified:
   trunk/BOOK/kde4/core/akonadi.xml
   trunk/BOOK/kde4/core/attica.xml
   trunk/BOOK/kde4/core/automoc4.xml
   trunk/BOOK/kde4/core/kde4base.xml
   trunk/BOOK/kde4/core/kde4baseworkspace.xml
   trunk/BOOK/kde4/core/kde4bindings.xml
   trunk/BOOK/kde4/core/kde4libs.xml
   trunk/BOOK/kde4/core/oxygen-icons.xml
   trunk/BOOK/kde4/core/phonon-backend-gstreamer.xml
   trunk/BOOK/kde4/core/phonon-backend-xine.xml
   trunk/BOOK/kde4/core/phonon.xml
   trunk/BOOK/kde4/core/polkit-qt.xml
   trunk/BOOK/kde4/core/qimageblitz.xml
   trunk/BOOK/kde4/intro/pre-install-config.xml
Log:
Cosmetic changes


Modified: trunk/BOOK/kde4/core/akonadi.xml
===================================================================
--- trunk/BOOK/kde4/core/akonadi.xml    2011-03-15 01:41:56 UTC (rev 8869)
+++ trunk/BOOK/kde4/core/akonadi.xml    2011-03-19 18:19:07 UTC (rev 8870)
@@ -124,8 +124,8 @@
       <seglistitem>
         <seg>akonadi_agent_server, akonadi_agent_launcher, akonadiserver, 
         akonadictl, akonadi_control, akonadi_rds</seg>
-        <seg></seg>
-        <seg>libakonadiprotocolinternals.so</seg>
+        <seg>libakonadiprotocolinternals.so, libqsqlite3.so</seg>
+        <seg>none</seg>
       </seglistitem>
     </segmentedlist>
 <!--

Modified: trunk/BOOK/kde4/core/attica.xml
===================================================================
--- trunk/BOOK/kde4/core/attica.xml     2011-03-15 01:41:56 UTC (rev 8869)
+++ trunk/BOOK/kde4/core/attica.xml     2011-03-19 18:19:07 UTC (rev 8870)
@@ -115,7 +115,7 @@
       <seglistitem>
         <seg>None</seg>
         <seg>libattica.so</seg>
-        <seg></seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
 <!--

Modified: trunk/BOOK/kde4/core/automoc4.xml
===================================================================
--- trunk/BOOK/kde4/core/automoc4.xml   2011-03-15 01:41:56 UTC (rev 8869)
+++ trunk/BOOK/kde4/core/automoc4.xml   2011-03-19 18:19:07 UTC (rev 8870)
@@ -117,8 +117,8 @@
 
       <seglistitem>
         <seg>automoc4</seg>
-        <seg></seg>
-        <seg></seg>
+        <seg>none</seg>
+        <seg>none</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/kde4/core/kde4base.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4base.xml   2011-03-15 01:41:56 UTC (rev 8869)
+++ trunk/BOOK/kde4/core/kde4base.xml   2011-03-19 18:19:07 UTC (rev 8870)
@@ -128,9 +128,11 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg></seg>
-        <seg></seg>
-        <seg></seg>
+        <seg>dolphin, kbookmarkmerger, kdepasswd, kdialog, keditbookmarks, 
kfind,
+        kfmclient, konqueror, konsole, konsoleprofile, kwrite, nspluginscan,
+        nspluginviewer, servicemenudeinstallation, 
servicemenuinstallation</seg>
+        <seg>Several libs in &kde4-dir;/lib{,/kde4}</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/kde4/core/kde4baseworkspace.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4baseworkspace.xml  2011-03-15 01:41:56 UTC (rev 
8869)
+++ trunk/BOOK/kde4/core/kde4baseworkspace.xml  2011-03-19 18:19:07 UTC (rev 
8870)
@@ -79,7 +79,7 @@
 -->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    GoogleGadgets, QEdje, Polkit-QT, lm-sensors, raw1394, BlueZ
+    GoogleGadgets, QEdje, Polkit-QT, lm-sensors, raw1394, BlueZ,
     libgps, Qalculate, ck-connector, NetworkManager, Dmtx
     </para>
 
@@ -179,7 +179,7 @@
     <para>Tweak this file to match your needs especially setting the keyboard 
layout
     if you not have a <filename>/etc/X11/xorg.conf</filename>. Every 
subsequent package 
     can be built while having <application>KDE4</application> up and running 
but
-    remember to keep <envar>$KDE_PREFIX</envar> and <envar>$QT4DIR</envar> 
set.</para>
+    remember to keep <envar>&kde4-dir;</envar> and <envar>$QT4DIR</envar> 
set.</para>
     
   </sect2>
   

Modified: trunk/BOOK/kde4/core/kde4bindings.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4bindings.xml       2011-03-15 01:41:56 UTC (rev 
8869)
+++ trunk/BOOK/kde4/core/kde4bindings.xml       2011-03-19 18:19:07 UTC (rev 
8870)
@@ -95,7 +95,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    Qwt5, QScintilla2, Polkit-QT, Mono,
+    <xref linkend="polkit-qt"/>, Qwt5, QScintilla2, Mono
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -107,12 +107,6 @@
   <sect2 role="installation">
     <title>Installation of Kdebindings</title>
 
-    <note><para>If you decided to install <application>KDE4</application> in 
-    another hierarchy than <application>Python</application> is installed
-    (usually <application>Python</application> is in /usr and 
<application>KDE4</application>
-    in /opt/kde4), than double check that the <envar>PYTHONPATH</envar> is 
-    set proper (see <xref linkend="kde4-pre-install-config"/>).</para></note>
-    
     <para>Install <application>kde4bindings</application> by running
     the following commands:</para>
 
@@ -123,7 +117,6 @@
        
 <screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
     -DKDE_DEFAULT_HOME=.kde4 \
-    -DPYTHON_SITE_PACKAGES_INSTALL_DIR=/usr/lib/python2.7/site-packages \
     -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     .. &amp;&amp;
 make</userinput></screen>
@@ -133,14 +126,19 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
+    
<para><option>-DPYTHON_SITE_PACKAGES_DIR:PATH=&lt;site-packages&gt;</option>: 
If you do not install KDE in /usr, set this option in order to have the KDE4
+Python objects installed correctly. You can use following code to determine 
tha directory name:
+<screen><userinput>_pylibdir=$(python-config --prefix)/lib &amp;&amp;
+_pyversion=$(python -V 2>&amp;1 | awk '{print $2}') &amp;&amp;
+echo "$_pylibdir/python${_pyversion%.*}/site-packages"</userinput></screen>
+    </para>
 
   </sect2>
--->
+
   <sect2 role="content">
     <title>Contents</title>
 

Modified: trunk/BOOK/kde4/core/kde4libs.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4libs.xml   2011-03-15 01:41:56 UTC (rev 8869)
+++ trunk/BOOK/kde4/core/kde4libs.xml   2011-03-19 18:19:07 UTC (rev 8870)
@@ -153,7 +153,7 @@
         kshell4, kunittestmodrunner, kwrapper4, makekdewidgets, meinproc4, 
         meinproc_simple, nepomuk-rcgen and preparetips</seg>
         <seg>several libs in &kde4-dir;/lib</seg>
-        <seg></seg>
+        <seg>/etc/kde4</seg>
       </seglistitem>
     </segmentedlist>
 <!--

Modified: trunk/BOOK/kde4/core/oxygen-icons.xml
===================================================================
--- trunk/BOOK/kde4/core/oxygen-icons.xml       2011-03-15 01:41:56 UTC (rev 
8869)
+++ trunk/BOOK/kde4/core/oxygen-icons.xml       2011-03-19 18:19:07 UTC (rev 
8870)
@@ -98,12 +98,14 @@
 
   </sect2>
 
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--xyz</option>: This option is set for ...</para>
+    <para><option>- -xyz</option>: This option is set for ...</para>
 
   </sect2>
+-->
 
   <sect2 role="content">
     <title>Contents</title>
@@ -114,8 +116,8 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg></seg>
-        <seg></seg>
+        <seg>None</seg>
+        <seg>None</seg>
         
<seg>&kde4-dir;/share/icons/oxygen/{128x128,16x16,22x22,256x256,32x32,48x48,64x64,8x8}</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/BOOK/kde4/core/phonon-backend-gstreamer.xml
===================================================================
--- trunk/BOOK/kde4/core/phonon-backend-gstreamer.xml   2011-03-15 01:41:56 UTC 
(rev 8869)
+++ trunk/BOOK/kde4/core/phonon-backend-gstreamer.xml   2011-03-19 18:19:07 UTC 
(rev 8870)
@@ -117,9 +117,9 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg></seg>
-        <seg></seg>
-        <seg></seg>
+        <seg>none</seg>
+        <seg>phonon_gstreamer.so</seg>
+        <seg>none</seg>
       </seglistitem>
     </segmentedlist>
 <!--

Modified: trunk/BOOK/kde4/core/phonon-backend-xine.xml
===================================================================
--- trunk/BOOK/kde4/core/phonon-backend-xine.xml        2011-03-15 01:41:56 UTC 
(rev 8869)
+++ trunk/BOOK/kde4/core/phonon-backend-xine.xml        2011-03-19 18:19:07 UTC 
(rev 8870)
@@ -117,9 +117,9 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg></seg>
-        <seg></seg>
-        <seg></seg>
+        <seg>none</seg>
+        <seg>phonon_xine.so</seg>
+        <seg>none</seg>
       </seglistitem>
     </segmentedlist>
 <!--

Modified: trunk/BOOK/kde4/core/phonon.xml
===================================================================
--- trunk/BOOK/kde4/core/phonon.xml     2011-03-15 01:41:56 UTC (rev 8869)
+++ trunk/BOOK/kde4/core/phonon.xml     2011-03-19 18:19:07 UTC (rev 8870)
@@ -139,9 +139,9 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg></seg>
+        <seg>none</seg>
         <seg>libphonon.so, libphononexperimental.so</seg>
-        <seg></seg>
+        <seg>none</seg>
       </seglistitem>
     </segmentedlist>
 <!--

Modified: trunk/BOOK/kde4/core/polkit-qt.xml
===================================================================
--- trunk/BOOK/kde4/core/polkit-qt.xml  2011-03-15 01:41:56 UTC (rev 8869)
+++ trunk/BOOK/kde4/core/polkit-qt.xml  2011-03-19 18:19:07 UTC (rev 8870)
@@ -114,9 +114,9 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg></seg>
-        <seg></seg>
-        <seg></seg>
+        <seg>None</seg>
+        <seg>libpolkit-qt-agent-1.so, libpolkit-qt-core-1.so, 
libpolkit-qt-gui-1.so</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
 <!--

Modified: trunk/BOOK/kde4/core/qimageblitz.xml
===================================================================
--- trunk/BOOK/kde4/core/qimageblitz.xml        2011-03-15 01:41:56 UTC (rev 
8869)
+++ trunk/BOOK/kde4/core/qimageblitz.xml        2011-03-19 18:19:07 UTC (rev 
8870)
@@ -128,7 +128,7 @@
       <seglistitem>
         <seg>blitztest</seg>
         <seg>libqimageblitz.so</seg>
-        <seg></seg>
+        <seg>none</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/kde4/intro/pre-install-config.xml
===================================================================
--- trunk/BOOK/kde4/intro/pre-install-config.xml        2011-03-15 01:41:56 UTC 
(rev 8869)
+++ trunk/BOOK/kde4/intro/pre-install-config.xml        2011-03-19 18:19:07 UTC 
(rev 8870)
@@ -15,54 +15,43 @@
 
   <title>KDE4 Pre-installation Configuration</title>
 
-  <para>Based on your preference, set <envar>&kde4-dir-var;</envar>. In
-  contrast to the previous version of <application>KDE</application> 
-  which uses <envar>KDE_PREFIX</envar>, the prefix is stored in
-  <envar>&kde4-dir-var;</envar> to avoid interferences. This prefix is
-  used to specify where <application>KDE4</application> should be
-  installed.</para>
-
-<!--
-  <para>You should consider installing the <xref linkend="desktop-file-utils"/>
-  package. Though not required, this package will allow you to easily use
-  existing <filename>.desktop</filename> files in
-  <filename class='directory'>/usr/share/applications</filename> (and any other
-  locations identified by <envar>XDG_DATA_DIRS</envar>), and automatically add
-  these applications to the <application>KDE4</application> menu system.</para>
--->
-
-  <para>Remember to execute <command>ldconfig</command> after installation
-  of libraries to update the library cache.</para>
-
   <sect2><title>Dependencies</title>
 
-    <para>As <application>KDE4</application> is a huge software collection 
+    <para><application>KDE4</application> is a huge software collection 
     providing a desktop, tools for system and development tasks as well as 
-    fun and educational stuff, it makes use of a tremendous amount of 
+    fun and educational stuff. It makes use of a tremendous amount of 
     non-KDE packages. While nearly all of those packages are optional,
-    some others are are highly recommended.</para>
-    <para>You should consider to install following packages. Installing
-    this packages will switch on some useful features in the resulting
-    <application>KDE4</application>.
+    some others are are highly recommended like <xref 
linkend="polkit"/>.</para>
 
+    <para>The following list of packages should give you an overview
+    about those packages and you may want to consider to install them
+    first. Installing this packages will switch on some useful features
+    in the resulting <application>KDE4</application>. Nevertheless the
+    dependencies are shown on each of the following pages.
+
     <itemizedlist>
       <listitem>
-        <para><ulink url="http://qjson.sourceforge.net";>QJSON</ulink> - Qt 
library for handling JavaScript objects</para>
+        <para><ulink url="http://qjson.sourceforge.net";>QJSON</ulink> 
(http://qjson.sourceforge.net) - Qt library for handling JavaScript objects. 
Unfortunatly, the release version 0.7.1 is to old to compile. Alternativly use 
the current SVN sources or apply a patch to bring the release to a usable 
status.</para>
+        <para>Compile it using <command>cmake -DCMAKE_INSTALL_PREFIX=/usr 
&amp;&amp; make &amp;&amp; make install</command> in its own build 
directory.</para> 
       </listitem>
       <listitem>
-         <para><ulink url="http://gpsd.berlios.de/";>libgps</ulink> - interface 
to GPS devices (kdeedu)</para>
+         <para><ulink url="http://gpsd.berlios.de/";>libgps</ulink> 
(http://gpsd.berlios.de/) - interface to GPS devices (kdeedu)</para>
+         <para>Compile it the usual way <command>configure &amp;&amp; make 
&amp;&amp; make install</command>.</para>
       </listitem>
       <listitem>
-        <para><ulink url="http://eigen.tuxfamily.org/";>eigen2</ulink> - a C++ 
template library for linear algebra</para>
+        <para><ulink url="http://eigen.tuxfamily.org/";>eigen2</ulink> 
(http://eigen.tuxfamily.org/) - a C++ template library for linear algebra</para>
+        <para>Compile it using <command>cmake -DCMAKE_INSTALL_PREFIX=/usr 
&amp;&amp; make &amp;&amp; make install</command>.</para>
       </listitem>
       <listitem>
         <para><xref linkend="desktop-file-utils"/> - a few command line 
utilities for working with desktop entries</para>
       </listitem>
       <listitem>
-        <para><ulink 
url="http://www.riverbankcomputing.com/software/sip/intro";>pySIP</ulink> - 
Python Service Integration Platform</para>
+        <para><ulink 
url="http://www.riverbankcomputing.com/software/sip/intro";>pySIP</ulink> 
(http://www.riverbankcomputing.com/software/sip/intro) - Python Service 
Integration Platform</para>
+        <para>Compile it <command>python ./configure &amp;&amp; make 
&amp;&amp; make install</command>.</para>
       </listitem>
       <listitem>
-        <para><ulink 
url="http://www.riverbankcomputing.com/software/pyqt/";>pyQT4</ulink> - Python 
interface to Qt4 (kdebindings)</para>
+        <para><ulink 
url="http://www.riverbankcomputing.com/software/pyqt/";>pyQT4</ulink> 
(http://www.riverbankcomputing.com/software/pyqt/) - Python interface to Qt4 
(kdebindings)</para>
+        <para>Compile it <command>python ./configure &amp;&amp; make 
&amp;&amp; make install</command>.</para>
       </listitem>
       <listitem>
         <para><xref linkend="ruby"/> - Ruby language (kdebindings)</para>
@@ -75,10 +64,12 @@
         <para><xref linkend="libical"/> - library handling calendar entries 
(kdepimlibs)</para>
       </listitem>
       <listitem>
-        <para><ulink url="http://cyberelk.net/tim/data/pycups/";>pyCUPS</ulink> 
- Python interface to CUPS (kdeadmin)</para>
+        <para><ulink url="http://cyberelk.net/tim/data/pycups/";>pyCUPS</ulink> 
(http://cyberelk.net/tim/data/pycups/) - Python interface to CUPS 
(kdeadmin)</para>
+        <para>Compile it with <command>make &amp;&amp; make 
install</command>.</para>
       </listitem>
       <listitem>
-        <para><ulink 
url="http://cyberelk.net/tim/data/system-config-printer/";>system-config-printer</ulink>
 - Printer config (kdeadmin)</para>
+        <para><ulink 
url="http://cyberelk.net/tim/data/system-config-printer/";>system-config-printer</ulink>
 (http://cyberelk.net/tim/data/system-config-printer/) - Printer config 
(kdeadmin)</para>
+        <para>Compile it the usual way <command>configure &amp;&amp; make 
&amp;&amp; make install</command>.</para>
       </listitem>
       <listitem>
         <para><xref linkend="libidn"/> - en-/decode internationalized domain 
names (kdenetwork)</para>
@@ -128,7 +119,8 @@
         <para><xref linkend="strigi"/> - Desktop indexing engine</para>
       </listitem>
       <listitem>
-        <para><ulink url="http://www.grantlee.org";>Grantlee</ulink> - a 
template system for Qt</para>
+        <para><ulink url="http://www.grantlee.org";>Grantlee</ulink> 
(http://www.grantlee.org) - a template system for Qt</para>
+        <para>Compile it using <command>cmake -DCMAKE_INSTALL_PREFIX=/usr 
&amp;&amp; make &amp;&amp; make install</command> in its own build 
directory.</para>
       </listitem>
     </itemizedlist>
     </para>
@@ -162,10 +154,11 @@
 KDE4DIR=&kde4-dir;
 KDEDIR=&kde4-dir;
 
-pathappend &kde4-dir;/bin           PATH
-pathappend &kde4-dir;/lib/pkgconfig PKG_CONFIG_PATH
-pathappend &kde4-dir;/share         XDG_DATA_DIRS
-pathappend /etc/kde4/xdg              XDG_CONFIG_DIRS
+pathappend &kde4-dir;/bin             PATH
+pathappend &kde4-dir;/lib/pkgconfig   PKG_CONFIG_PATH
+pathappend &kde4-dir;/share/pkgconfig PKG_CONFIG_PATH
+pathappend &kde4-dir;/share           XDG_DATA_DIRS
+pathappend /etc/kde4/xdg                XDG_CONFIG_DIRS
 
 export KDE4_PREFIX KDE4DIR KDEDIR
 export PATH PKG_CONFIG_PATH XDG_DATA_DIRS XDG_CONFIG_DIRS

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

Reply via email to