Changeset 2a7334e8 for kde

Timestamp:

08/08/2012 03:38:30 PM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

6d87c25

Parents:

97909da

Message:

Update to KDE 4.9.0 and a major overhaul of the section.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10496 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

kde

Files:

• add/add-pkgs.xml (moved) (moved from kde4/add/add-pkgs.xml ) (2 diffs)
• add/add.xml (moved) (moved from kde4/add/add.xml ) (2 diffs)
• add/ark.xml (moved) (moved from kde4/add/ark.xml ) (5 diffs)
• add/gwenview.xml (moved) (moved from kde4/add/gwenview.xml ) (6 diffs)
• add/kate.xml (moved) (moved from kde4/add/kate.xml ) (3 diffs)
• add/kde-base-artwork.xml (added)
• add/kdeadmin.xml (moved) (moved from kde4/add/kde4admin.xml ) (4 diffs)
• add/kdenetwork.xml (moved) (moved from kde4/add/kde4network.xml ) (4 diffs)
• add/kdepim-runtime.xml (moved) (moved from kde4/add/kde4pimruntime.xml ) (5 diffs)
• add/kdepim.xml (moved) (moved from kde4/add/kde4pim.xml ) (6 diffs)
• add/kdeplasma-addons.xml (moved) (moved from kde4/add/kde4plasmaaddons.xml ) (8 diffs)
• add/kmix.xml (moved) (moved from kde4/add/kcalc.xml ) (8 diffs)
• add/konsole.xml (moved) (moved from kde4/add/konsole.xml ) (5 diffs)
• add/libkexiv2.xml (moved) (moved from kde4/add/libkexiv2.xml ) (5 diffs)
• add/okular.xml (moved) (moved from kde4/add/okular.xml ) (4 diffs)
• core/akonadi.xml (moved) (moved from kde4/core/akonadi.xml )
• core/attica.xml (moved) (moved from kde4/core/attica.xml ) (1 diff)
• core/automoc4.xml (moved) (moved from kde4/core/automoc4.xml ) (2 diffs)
• core/config.xml (moved) (moved from kde4/core/config.xml ) (2 diffs)
• core/core.xml (moved) (moved from kde4/core/core.xml ) (1 diff)
• core/kactivities.xml (moved) (moved from kde4/core/kactivities.xml ) (3 diffs)
• core/kde-baseapps.xml (moved) (moved from kde4/core/kde4baseapps.xml ) (7 diffs)
• core/kde-runtime.xml (moved) (moved from kde4/core/kde4runtime.xml ) (11 diffs)
• core/kde-workspace.xml (moved) (moved from kde4/core/kde4workspace.xml ) (7 diffs)
• core/kdelibs.xml (moved) (moved from kde4/core/kde4libs.xml ) (4 diffs)
• core/kdepimlibs.xml (moved) (moved from kde4/core/kde4pimlibs.xml ) (4 diffs)
• core/nepomuk-core.xml (added)
• core/oxygen-icons.xml (moved) (moved from kde4/core/oxygen-icons.xml ) (2 diffs)
• core/phonon-backend-gstreamer.xml (moved) (moved from kde4/core/phonon-backend-gstreamer.xml ) (2 diffs)
• core/phonon-backend-vlc.xml (moved) (moved from kde4/core/phonon-backend-vlc.xml ) (2 diffs)
• core/phonon.xml (moved) (moved from kde4/core/phonon.xml ) (3 diffs)
• core/polkit-kde-agent.xml (moved) (moved from kde4/core/polkit-kde-agent.xml )
• core/polkit-qt.xml (moved) (moved from kde4/core/polkit-qt.xml ) (3 diffs)
• core/qimageblitz.xml (moved) (moved from kde4/core/qimageblitz.xml ) (2 diffs)
• core/shrdesktopontologies.xml (moved) (moved from kde4/core/shrdesktopontologies.xml ) (2 diffs)
• intro/introduction.xml (moved) (moved from kde4/intro/introduction.xml ) (1 diff)
• intro/kde-intro.xml (added)
• intro/pre-install-config.xml (moved) (moved from kde4/intro/pre-install-config.xml ) (4 diffs)
• kde.xml (moved) (moved from kde4/kde4.xml ) (1 diff)

kde/add/add-pkgs.xml

@@ -27 +27 @@
       <itemizedlist>
          <listitem>
+          <para>Kdeartwork: Collection of wallpapers, icon themes, screensavers, widget styles etc.</para>
+        </listitem>
+        <listitem>
+          <para>Juk: A lightweight music player.</para>
+        </listitem>
+        <listitem>
+          <para>Dragon: A video player.</para>
+        </listitem>
+        <listitem>
+          <para>Kcalc: A scientific calculator.</para>
+        </listitem>
+        <listitem>
+          <para>PyKDE4: Python bindings.</para>
+        </listitem>
+        <listitem>
           <para>Kdegames: Collection of desktop games.</para>
         </listitem>
@@ -39 +54 @@
         </listitem>
         <listitem>
-          <para>Marble: Map program.</para>
+          <para>Marble: A global map program.</para>
         </listitem>
         <listitem>

kde/add/add.xml

@@ -12 +12 @@
 
 <chapter id="kde-add">
-  <?dbhtml filename="kde4add.html"?>
+  <?dbhtml filename="add.html"?>
 
   <title>KDE Additional Packages</title>
@@ -18 +18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ark.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kcalc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4admin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4pim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4pimruntime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4multimedia.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4artwork.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4plasmaaddons.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeadmin.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdenetwork.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmix.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim-runtime.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-base-artwork.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkexiv2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeplasma-addons.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="okular.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gwenview.xml"/>

kde/add/ark.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY ark-download-http "&kde-download-http;&ark-version;/src/ark-&ark-version;.tar.xz">
-  <!ENTITY ark-download-ftp  "&kde-download-ftp;&ark-version;/src/ark-&ark-version;.tar.xz">
-  <!ENTITY ark-md5sum        "d6f6a3665cac5e9f4ce7999582e3f612">
-  <!ENTITY ark-size          "150 KB">
-  <!ENTITY ark-buildsize     "35 MB">
+  <!ENTITY ark-download-http "&kde-download-http;&kde-version;/src/ark-&kde-version;.tar.xz">
+  <!ENTITY ark-download-ftp  "&kde-download-ftp;&kde-version;/src/ark-&kde-version;.tar.xz">
+  <!ENTITY ark-md5sum        "cf438f95d83497cf39fe5e491f4792aa">
+  <!ENTITY ark-size          "229 KB">
+  <!ENTITY ark-buildsize     "34 MB">
   <!ENTITY ark-time          "0.8 SBU">
 ]>
 
-<sect1 id="ark" xreflabel="ark-&ark-version;">
+<sect1 id="ark" xreflabel="ark-&kde-version;">
   <?dbhtml filename="ark.html"?>
 
@@ -21 +21 @@
   </sect1info>
 
-  <title>Ark-&ark-version;</title>
+  <title>Ark-&kde-version;</title>
 
   <indexterm zone="ark">
@@ -61 +61 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/ark-&ark-version;-fixes-1.patch"/></para>
+        url="&patch-root;/ark-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -69 +69 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdebaseapps"/> and
+    <xref linkend="kde-baseapps"/> and
     <xref linkend="libarchive"/>
     </para>
@@ -124 +124 @@
       <seglistitem>
         <seg>ark</seg>
-        <seg>arkpart.so, libextracthere.so, libkerfuffle.so and kerfuffle_*.so</seg>
-        <seg>...</seg>
+        <seg>libkerfuffle.so and several in &kde-dir;/lib/kde4</seg>
+        <seg>several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>

kde/add/gwenview.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY gwenview-download-http "http://mirrors.isc.org/pub/kde/stable/&gwenview-version;/src/gwenview-&gwenview-version;.tar.xz">
-  <!ENTITY gwenview-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/&gwenview-version;/src/gwenview-&gwenview-version;.tar.xz">
-  <!ENTITY gwenview-md5sum        "5c1eae6507a9c0e2924caa2180377e42">
-  <!ENTITY gwenview-size          "1.9 MB">
-  <!ENTITY gwenview-buildsize     "112 MB">
+  <!ENTITY gwenview-download-http "http://mirrors.isc.org/pub/kde/stable/&kde-version;/src/gwenview-&kde-version;.tar.xz">
+  <!ENTITY gwenview-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/&kde-version;/src/gwenview-&kde-version;.tar.xz">
+  <!ENTITY gwenview-md5sum        "505231de40d2c3ea220a150ba4c39d2c">
+  <!ENTITY gwenview-size          "2.0 MB">
+  <!ENTITY gwenview-buildsize     "114 MB">
   <!ENTITY gwenview-time          "1.6 SBU">
 ]>
 
-<sect1 id="gwenview" xreflabel="gwenview-&gwenview-version;">
+<sect1 id="gwenview" xreflabel="gwenview-&kde-version;">
   <?dbhtml filename="gwenview.html"?>
 
@@ -21 +21 @@
   </sect1info>
 
-  <title>Gwenview-&gwenview-version;</title>
+  <title>Gwenview-&kde-version;</title>
 
   <indexterm zone="gwenview">
@@ -30 +30 @@
     <title>Introduction to Gwenview</title>
 
-    <para>Gwenview is a fast and easy to use image viewer for KDE.</para> 
+    <para>Gwenview is a fast and easy-to-use image viewer for KDE.</para>
 
     &lfs71_checked;
@@ -61 +61 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/gwenview-&gwenview-version;-fixes-1.patch"/></para>
+        url="&patch-root;/gwenview-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -74 +74 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="kdebaseapps"/>, 
+    <xref linkend="kde-baseapps"/>, 
     <xref linkend="libkexiv2"/> and
     <xref linkend="libjpeg"/>
@@ -82 +82 @@
     <para role="optional">
       <ulink url="http://kde-apps.org/content/show.php/Kipi-Plugins?content=16061">
-      Kipi-Plugins</ulink> (a collection of image plugins) 
+      Kipi-Plugins</ulink> (a collection of image manipulation plugins) 
     </para>
 

kde/add/kate.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kate-download-http "&kde-download-http;&kate-version;/src/kate-&kate-version;.tar.xz">
-  <!ENTITY kate-download-ftp  "&kde-download-ftp;&kate-version;/src/kate-&kate-version;.tar.xz">
-  <!ENTITY kate-md5sum        "e109cc4f76dd0128349999e4713f31dc">
+  <!ENTITY kate-download-http "&kde-download-http;&kde-version;/src/kate-&kde-version;.tar.xz">
+  <!ENTITY kate-download-ftp  "&kde-download-ftp;&kde-version;/src/kate-&kde-version;.tar.xz">
+  <!ENTITY kate-md5sum        "563e203be134a1cae5f13bd625ca6928">
   <!ENTITY kate-size          "2.0 MB">
-  <!ENTITY kate-buildsize     "283 MB">
+  <!ENTITY kate-buildsize     "325 MB">
   <!ENTITY kate-time          "4.6 SBU">
 ]>
 
-<sect1 id="kate" xreflabel="kate-&kate-version;">
+<sect1 id="kate" xreflabel="kate-&kde-version;">
   <?dbhtml filename="kate.html"?>
 
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kate-&kate-version;</title>
+  <title>Kate-&kde-version;</title>
 
   <indexterm zone="kate">
@@ -124 +124 @@
       <seglistitem>
         <seg>kate, ktesnippets_editor and kwrite</seg>
-        <seg>libkdeinit4_kwrite.so, libktexteditor_codesnippets_core.so, 
-        libkdeinit4_kate.so, libkateinterfaces.so and libkatepartinterfaces.so</seg>
-        <seg>...</seg>
+        <seg>libkateinterfaces.so, libkatepartinterfaces.so,
+        libkdeinit4_kate.so, libkdeinit4_kwrite.so,
+        libktexteditor_codesnippets_core.so and several in &kde-dir;/lib/kde4
+        </seg>
+        <seg>several in &kde-dir;/include and &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>

kde/add/kdeadmin.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdeadmin-download-http "&kde-download-http;&kdeadmin-version;/src/kdeadmin-&kdeadmin-version;.tar.xz">
-  <!ENTITY kdeadmin-download-ftp  "&kde-download-ftp;&kdeadmin-version;/src/kdeadmin-&kdeadmin-version;.tar.xz"> 
-  <!ENTITY kdeadmin-md5sum        "e91742cf1c77b7c799f2b1d974088a1d">
-  <!ENTITY kdeadmin-size          "730 KB">
-  <!ENTITY kdeadmin-buildsize     "116 MB">
+  <!ENTITY kdeadmin-download-http "&kde-download-http;&kde-version;/src/kdeadmin-&kde-version;.tar.xz">
+  <!ENTITY kdeadmin-download-ftp  "&kde-download-ftp;&kde-version;/src/kdeadmin-&kde-version;.tar.xz">
+  <!ENTITY kdeadmin-md5sum        "e5722b8ce1ad6dccfc17099023bec3db">
+  <!ENTITY kdeadmin-size          "1.1 MB">
+  <!ENTITY kdeadmin-buildsize     "123 MB">
   <!ENTITY kdeadmin-time          "2.2 SBU">
 ]>
 
-<sect1 id="kdeadmin" xreflabel="kdeadmin-&kdeadmin-version;">
-  <?dbhtml filename="kde4admin.html"?>
+<sect1 id="kdeadmin" xreflabel="kdeadmin-&kde-version;">
+  <?dbhtml filename="kdeadmin.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kdeadmin-&kdeadmin-version;</title>
+  <title>Kdeadmin-&kde-version;</title>
 
   <indexterm zone="kdeadmin">
@@ -63 +63 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kdeadmin-&kdeadmin-version;-fixes-1.patch"/></para>
+        url="&patch-root;/kdeadmin-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -127 +127 @@
 
       <seglistitem>
-        <seg>kuser, ksystemlog</seg>
+        <seg>ksystemlog and kuser</seg>
         <seg>kcm_cron.so</seg>
         <seg>several in &kde-dir;/share</seg>

kde/add/kdenetwork.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdenetwork-download-http "&kde-download-http;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz">
-  <!ENTITY kdenetwork-download-ftp  "&kde-download-ftp;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz"> 
-  <!ENTITY kdenetwork-md5sum        "f6749a63de31ed16725bb71bd0eafaca">
+  <!ENTITY kdenetwork-download-http "&kde-download-http;&kde-version;/src/kdenetwork-&kde-version;.tar.xz">
+  <!ENTITY kdenetwork-download-ftp  "&kde-download-ftp;&kde-version;/src/kdenetwork-&kde-version;.tar.xz">
+  <!ENTITY kdenetwork-md5sum        "498dde690fd5609c08a049bf50913117">
   <!ENTITY kdenetwork-size          "8.5 MB">
   <!ENTITY kdenetwork-buildsize     "665 MB">
@@ -13 +13 @@
 ]>
 
-<sect1 id="kdenetwork" xreflabel="kdenetwork-&kdenetwork-version;">
-  <?dbhtml filename="kde4network.html"?>
+<sect1 id="kdenetwork" xreflabel="kdenetwork-&kde-version;">
+  <?dbhtml filename="kdenetwork.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kdenetwork-&kdenetwork-version;</title>
+  <title>Kdenetwork-&kde-version;</title>
 
   <indexterm zone="kdenetwork">
@@ -63 +63 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kdenetwork-&kdenetwork-version;-fixes-1.patch"/></para>
+        url="&patch-root;/kdenetwork-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>

kde/add/kdepim-runtime.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdepimruntime-download-http "&kde-download-http;&kdepimruntime-version;/src/kdepim-runtime-&kdepimruntime-version;.tar.xz">
-  <!ENTITY kdepimruntime-download-ftp  "&kde-download-ftp;&kdepimruntime-version;/src/kdepim-runtime-&kdepimruntime-version;.tar.xz">
-  <!ENTITY kdepimruntime-md5sum        "3aab404f1a51f5f77581ddc93895dd9d">
-  <!ENTITY kdepimruntime-size          "1.1 MB">
-  <!ENTITY kdepimruntime-buildsize     "400 MB">
-  <!ENTITY kdepimruntime-time          "7.2 SBU">
+  <!ENTITY kdepim-runtime-download-http "&kde-download-http;&kde-version;/src/kdepim-runtime-&kde-version;.tar.xz">
+  <!ENTITY kdepim-runtime-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepim-runtime-&kde-version;.tar.xz">
+  <!ENTITY kdepim-runtime-md5sum        "391052555a6206c362e5be3ee8962136">
+  <!ENTITY kdepim-runtime-size          "1.1 MB">
+  <!ENTITY kdepim-runtime-buildsize     "396 MB">
+  <!ENTITY kdepim-runtime-time          "7.2 SBU">
 ]>
 
-<sect1 id="kdepimruntime" xreflabel="kdepim-runtime-&kdepimruntime-version;">
-  <?dbhtml filename="kde4pimruntime.html"?>
+<sect1 id="kdepim-runtime" xreflabel="kdepim-runtime-&kde-version;">
+  <?dbhtml filename="kdepim-runtime.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kdepim-runtime-&kdepimruntime-version;</title>
+  <title>Kdepim-runtime-&kde-version;</title>
 
-  <indexterm zone="kdepimruntime">
-    <primary sortas="a-kdepim">kdepimruntime</primary>
+  <indexterm zone="kdepim-runtime">
+    <primary sortas="a-kdepim-runtime">kdepim-runtime</primary>
   </indexterm>
 
@@ -38 +38 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&kdepimruntime-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&kdepim-runtime-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&kdepimruntime-download-ftp;"/></para>
+        <para>Download (FTP): <ulink url="&kdepim-runtime-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &kdepimruntime-md5sum;</para>
+        <para>Download MD5 sum: &kdepim-runtime-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &kdepimruntime-size;</para>
+        <para>Download size: &kdepim-runtime-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &kdepimruntime-buildsize;</para>
+        <para>Estimated disk space required: &kdepim-runtime-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &kdepimruntime-time;</para>
+        <para>Estimated build time: &kdepim-runtime-time;</para>
       </listitem>
     </itemizedlist>
@@ -76 +76 @@
     <para role="recommended">
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+    <ulink url="http://projects.kde.org/libkgapi">LibKGAPI</ulink> (to access Google services) and
+    <ulink url="http://git.kolab.org">KolabLibraries</ulink>
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdepimruntime"/>
+    <ulink url="&blfs-wiki;/kdepim-runtime"/>
     </para>
 
@@ -122 +124 @@
 
       <seglistitem>
-        <seg>accountwizard, akonadi2xml, akonadi_*, akonaditray, 
-        kaddressbookmigrator, kjotsmigrator, kmail-migrator and kres-migrator</seg>
-        <seg>libakonadi-filestore.so, libakonadi-xml.so, libkdepim-copy.so, 
-        libkmindexreader.so, libmaildir.so, libnepomukdatamanagement-copy.so and 
-        libnepomukfeederpluginlib.a</seg>
-        <seg></seg>
+        <seg>accountwizard, akonadi2xml, akonadi_*_resource, akonaditray, 
+        kaddressbookmigrator, kjotsmigrator, kmail-migrator and kres-migrator
+        </seg>
+        <seg>libakonadi-filestore.so, libakonadi-xml.so, libkdepim-copy.so,
+        libkdepim-runtime-dms-copy.so, libkmindexreader.so, libmaildir.so,
+        libnepomukfeederpluginlib.a and several in &kde-dir;/lib/kde4</seg>
+        <seg>several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>

kde/add/kdepim.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdepim-download-http "&kde-download-http;&kdepim-version;/src/kdepim-&kdepim-version;.tar.xz">
-  <!ENTITY kdepim-download-ftp  "&kde-download-ftp;&kdepim-version;/src/kdepim-&kdepim-version;.tar.xz">
-  <!ENTITY kdepim-md5sum        "31446093aa268efc0e71f0b9b8753fac">
-  <!ENTITY kdepim-size          "13.8 MB">
-  <!ENTITY kdepim-buildsize     "1.3 GB">
+  <!ENTITY kdepim-download-http "&kde-download-http;&kde-version;/src/kdepim-&kde-version;.tar.xz">
+  <!ENTITY kdepim-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepim-&kde-version;.tar.xz">
+  <!ENTITY kdepim-md5sum        "8ca3d0ae6ee915c27ccf49c72d74d0c4">
+  <!ENTITY kdepim-size          "13.7 MB">
+  <!ENTITY kdepim-buildsize     "1.5 GB">
   <!ENTITY kdepim-time          "19.2 SBU">
 ]>
 
-<sect1 id="kdepim" xreflabel="kdepim-&kdepim-version;">
-  <?dbhtml filename="kde4pim.html"?>
+<sect1 id="kdepim" xreflabel="kdepim-&kde-version;">
+  <?dbhtml filename="kdepim.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kdepim-&kdepim-version;</title>
+  <title>Kdepim-&kde-version;</title>
 
   <indexterm zone="kdepim">
@@ -32 +32 @@
     <para>This package provides several KDE programs for managing
     personal information. Programs include a contact manager,
-    calendar, mail utilities, newsreader, X.509 certificate manager
+    calendar, mail client, newsreader, X.509 certificate manager
     and sticky notes.</para>
 
@@ -64 +64 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kdepim-&kdepim-version;-fixes-1.patch"/></para>
+        url="&patch-root;/kdepim-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -83 +83 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="cyrus-sasl"/>,
     <ulink url="ftp://ftp.kde.org/pub/kde/stable/prison/1.0/src/">Prison</ulink>,
     <ulink url="http://www.gitorious.org/grantlee/pages/Home">Grantlee</ulink> and
@@ -130 +129 @@
 
       <seglistitem>
-        <seg>akonadi_mailfilter_agent, akonadiconsole, akregator, akregatorstorageexporter, blogilo, 
-        ical2vcal, kabc2mutt, kabcclient, 
-        kaddressbook, kaddressbook-mobile, kalarm, kalarmautostart, karm, kgpgconf, kincidenceeditor, kjots,
-        kleopatra, kmail, kmail_mobile, kmail_antivir.sh, kmail_clamav.sh, kmail_fprot.sh, kmail_sav.sh, kmailcvt,
-        knode, knotes, konsolekalendar, kontact, korgac, korganizer, korganizer-mobile, ksendemail,
-        ktimetracker, kwatchgnupg, notes-mobile and tasks-mobile</seg>
-        <seg>numerous in &kde-dir;/lib</seg>
-        <seg></seg>
+        <seg>akonadi_archivemail_agent, akonadi_mailfilter_agent,
+        akonadiconsole, akregator, akregatorstorageexporter, backupmail,
+        blogilo, ical2vcal, importwizard, kabc2mutt, kabcclient,
+        kaddressbook, kaddressbook-mobile, kalarm, kalarmautostart, karm,
+        kgpgconf, kincidenceeditor, kleopatra, kmail, kmail-mobile,
+        kmail_antivir.sh, kmail_clamav.sh, kmail_fprot.sh, kmail_sav.sh,
+        kmailcvt, knode, knotes, konsolekalendar, kontact, korgac, korganizer,
+        korganizer-mobile, ksendemail, ktimetracker, ktnef, kwatchgnupg,
+        notes-mobile and tasks-mobile</seg>
+        <seg>several in &kde-dir;/lib</seg>
+        <seg>several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>

kde/add/kdeplasma-addons.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdeplasmaaddons-download-http "&kde-download-http;&kdeplasmaaddons-version;/src/kdeplasma-addons-&kdeplasmaaddons-version;.tar.xz">
-  <!ENTITY kdeplasmaaddons-download-ftp  "&kde-download-ftp;&kdeplasmaaddons-version;/src/kdeplasma-addons-&kdeplasmaaddons-version;.tar.xz">
-  <!ENTITY kdeplasmaaddons-md5sum        "6da9a63dd71c39d7650ae3c07b06d969">
-  <!ENTITY kdeplasmaaddons-size          "1.6 MB">
-  <!ENTITY kdeplasmaaddons-buildsize     "386 MB">
-  <!ENTITY kdeplasmaaddons-time          "5.1 SBU">
+  <!ENTITY kdeplasma-addons-download-http "&kde-download-http;&kde-version;/src/kdeplasma-addons-&kde-version;.tar.xz">
+  <!ENTITY kdeplasma-addons-download-ftp  "&kde-download-ftp;&kde-version;/src/kdeplasma-addons-&kde-version;.tar.xz">
+  <!ENTITY kdeplasma-addons-md5sum        "0aabcacb0036fa99389eaba950bc3dce">
+  <!ENTITY kdeplasma-addons-size          "1.7 MB">
+  <!ENTITY kdeplasma-addons-buildsize     "399 MB">
+  <!ENTITY kdeplasma-addons-time          "5.1 SBU">
 ]>
 
-<sect1 id="kdeplasmaaddons" xreflabel="kdeplasma-addons-&kdeplasmaaddons-version;">
-  <?dbhtml filename="kde4plasmaaddons.html"?>
+<sect1 id="kdeplasma-addons" xreflabel="kdeplasma-addons-&kde-version;">
+  <?dbhtml filename="kdeplasma-addons.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kdeplasma-addons-&kdeplasmaaddons-version;</title>
+  <title>Kdeplasma-addons-&kde-version;</title>
 
-  <indexterm zone="kdeplasmaaddons">
-    <primary sortas="a-kdeplasmaaddons">kdeplasmaaddons</primary>
+  <indexterm zone="kdeplasma-addons">
+    <primary sortas="a-kdeplasma-addons">kdeplasma-addons</primary>
   </indexterm>
 
@@ -38 +38 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&kdeplasmaaddons-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&kdeplasma-addons-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&kdeplasmaaddons-download-ftp;"/></para>
+        <para>Download (FTP): <ulink url="&kdeplasma-addons-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &kdeplasmaaddons-md5sum;</para>
+        <para>Download MD5 sum: &kdeplasma-addons-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &kdeplasmaaddons-size;</para>
+        <para>Download size: &kdeplasma-addons-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &kdeplasmaaddons-buildsize;</para>
+        <para>Estimated disk space required: &kdeplasma-addons-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &kdeplasmaaddons-time;</para>
+        <para>Estimated build time: &kdeplasma-addons-time;</para>
       </listitem>
     </itemizedlist>
@@ -62 +62 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kdeplasmaaddons-&kdeplasmaaddons-version;-fixes-1.patch"/></para>
+        url="&patch-root;/kdeplasma-addons-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -70 +70 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdeworkspace"/> and
+    <xref linkend="kde-workspace"/> and
     <xref linkend="kdepimlibs"/>
     </para>
@@ -81 +81 @@
     <para role="optional">
     <xref linkend="libkexiv2"/>,
-    <ulink url="http://edu.kde.org/marble/">Marble</ulink> (for the desktop globe wallpaper) and
-    <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin)
+    <ulink url="http://edu.kde.org/marble/">Marble</ulink> (for the desktop globe wallpaper),
+    <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin),
+    <ulink url="http://qjson.sourceforge.net/">qjson</ulink> and
+    <ulink url="https://github.com/ayoy/qoauth">QOAuth</ulink> (needed for the Plasma microblog dataengine)
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdeplasmaaddons"/>
+    <ulink url="&blfs-wiki;/kdeplasma-addons"/>
     </para>
 
@@ -130 +132 @@
         libplasmacomicprovidercore.so, libplasmapotdprovidercore.so, libplasmaweather.so, 
         librtm.so and several in &kde-dir;/lib/kde4</seg>
-        <seg>...</seg>
+        <seg>several in &kde-dir;/include and &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
@@ -139 +141 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kdeplasmaaddons">
-        <term><command>kdeplasmaaddons</command></term>
+      <varlistentry id="a-kdeplasma-addons">
+        <term><command>kdeplasma-addons</command></term>
         <listitem>
-          <para>is a testing utility for kdeplasmaaddons-generated build trees.</para>
-          <indexterm zone="a-kdeplasmaaddons kdeplasmaaddons">
-            <primary sortas="b-kdeplasmaaddons">kdeplasmaaddons</primary>
+          <para>is a testing utility for kdeplasma-addons-generated build trees.</para>
+          <indexterm zone="a-kdeplasma-addons kdeplasma-addons">
+            <primary sortas="b-kdeplasma-addons">kdeplasma-addons</primary>
           </indexterm>
         </listitem>

kde/add/kmix.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kcalc-download-http "&kde-download-http;&kcalc-version;/src/kcalc-&kcalc-version;.tar.xz">
-  <!ENTITY kcalc-download-ftp  "&kde-download-ftp;&kcalc-version;/src/kcalc-&kcalc-version;.tar.xz">
-  <!ENTITY kcalc-md5sum        "b996f77c1870fc521cd5737c7e6d0d02">
-  <!ENTITY kcalc-size          "85 KB">
-  <!ENTITY kcalc-buildsize     "11 MB">
-  <!ENTITY kcalc-time          "0.2 SBU">
+  <!ENTITY kmix-download-http "&kde-download-http;&kde-version;/src/kmix-&kde-version;.tar.xz">
+  <!ENTITY kmix-download-ftp  "&kde-download-ftp;&kde-version;/src/kmix-&kde-version;.tar.xz">
+  <!ENTITY kmix-md5sum        "d380f01c837ee4609d7382a5a2b9cff2">
+  <!ENTITY kmix-size          "294 KB">
+  <!ENTITY kmix-buildsize     "65 MB">
+  <!ENTITY kmix-time          "0.3 SBU">
 ]>
 
-<sect1 id="kcalc" xreflabel="kcalc-&kcalc-version;">
-  <?dbhtml filename="kcalc.html"?>
-
+<sect1 id="kmix" xreflabel="kmix-&kde-version;">
+  <?dbhtml filename="kmix.html"?>
+  
   <sect1info>
     <othername>$LastChangedBy$</othername>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kcalc-&kcalc-version;</title>
+  <title>Kmix-&kde-version;</title>
 
-  <indexterm zone="kcalc">
-    <primary sortas="a-kcalc">kcalc</primary>
+  <indexterm zone="kmix">
+    <primary sortas="a-kmix">kmix</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Kcalc</title>
+    <title>Introduction to Kmix</title>
 
-    <para>This package provides a scientific calculator for KDE.</para> 
+    <para>This packages provides an audio mixer application for KDE.</para>
 
     &lfs71_checked;
@@ -37 +37 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&kcalc-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&kmix-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&kcalc-download-ftp;"/></para>
+        <para>Download (FTP): <ulink url="&kmix-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &kcalc-md5sum;</para>
+        <para>Download MD5 sum: &kmix-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &kcalc-size;</para>
+        <para>Download size: &kmix-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &kcalc-buildsize;</para>
+        <para>Estimated disk space required: &kmix-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &kcalc-time;</para>
+        <para>Estimated build time: &kmix-time;</para>
       </listitem>
     </itemizedlist>
@@ -61 +61 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kcalc-&kcalc-version;-fixes-1.patch"/></para>
+        url="&patch-root;/kmix-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
 -->
-    <bridgehead renderas="sect3">Kcalc Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Kmix Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -71 +71 @@
     <xref linkend="kdelibs"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+    <xref linkend="pulseaudio"/> and
+    <xref linkend="libcanberra"/>
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kcalc"/>
+    <ulink url="&blfs-wiki;/kmix"/>
     </para>
 
@@ -87 +85 @@
 
   <sect2 role="installation">
-    <title>Installation of Kcalc</title>
+    <title>Installation of Kmix</title>
 
-    <para>Install <application>Kcalc</application> by running
+    <para>Install <application>Kmix</application> by running
     the following commands:</para>
 
@@ -121 +119 @@
 
       <seglistitem>
-        <seg>kcalc</seg>
-        <seg>libkdeinit4_kcalc.so</seg>
-        <seg>several in &kde-dir;/share</seg>
+        <seg>kmix and kmixctrl</seg>
+        <seg>libkdeinit4_kmix.so, libkdeinit4_kmixctrl.so, kded_kmixd.so
+        and plasma_engine_mixer.so</seg>
+        <seg>several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
@@ -132 +131 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kcalc">
-        <term><command>kcalc</command></term>
+      <varlistentry id="a-kmix">
+        <term><command>kmix</command></term>
         <listitem>
-          <para>is a testing utility for kcalc-generated build trees.</para>
-          <indexterm zone="a-kcalc kcalc">
-            <primary sortas="b-kcalc">kcalc</primary>
+          <para>is a testing utility for kmix-generated build trees.</para>
+          <indexterm zone="a-kmix kmix">
+            <primary sortas="b-kmix">kmix</primary>
           </indexterm>
         </listitem>

kde/add/konsole.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY konsole-download-http "&kde-download-http;&konsole-version;/src/konsole-&konsole-version;.tar.xz">
-  <!ENTITY konsole-download-ftp  "&kde-download-ftp;&konsole-version;/src/konsole-&konsole-version;.tar.xz">
-  <!ENTITY konsole-md5sum        "980afa132c7c1b89a08ecc6c70a98ad5">
-  <!ENTITY konsole-size          "425 KB">
-  <!ENTITY konsole-buildsize     "46 MB">
+  <!ENTITY konsole-download-http "&kde-download-http;&kde-version;/src/konsole-&kde-version;.tar.xz">
+  <!ENTITY konsole-download-ftp  "&kde-download-ftp;&kde-version;/src/konsole-&kde-version;.tar.xz">
+  <!ENTITY konsole-md5sum        "0999ac1ebe7c8c863c117fa3169555b4">
+  <!ENTITY konsole-size          "423 KB">
+  <!ENTITY konsole-buildsize     "54 MB">
   <!ENTITY konsole-time          "0.7 SBU">
 ]>
 
-<sect1 id="konsole" xreflabel="konsole-&konsole-version;">
+<sect1 id="konsole" xreflabel="konsole-&kde-version;">
   <?dbhtml filename="konsole.html"?>
 
@@ -21 +21 @@
   </sect1info>
 
-  <title>Konsole-&konsole-version;</title>
+  <title>Konsole-&kde-version;</title>
 
   <indexterm zone="konsole">
@@ -61 +61 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/konsole-&konsole-version;-fixes-1.patch"/></para>
+        url="&patch-root;/konsole-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -69 +69 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>
+    <xref linkend="kde-baseapps"/>
     </para>
 <!--
@@ -121 +121 @@
 
       <seglistitem>
-        <seg>konsole</seg>
-        <seg>libkdeinit4_konsole.so and libkonsoleprivate.so</seg>
-        <seg>...</seg>
+        <seg>konsole and konsoleprofile</seg>
+        <seg>libkdeinit4_konsole.so, libkonsolepart.so and libkonsoleprivate.so
+        </seg>
+        <seg>&kde-dir;/share/apps/konsole and
+        &kde-dir;/share/doc/HTML/en/konsole</seg>
       </seglistitem>
     </segmentedlist>

kde/add/libkexiv2.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY libkexiv2-download-http "&kde-download-http;&libkexiv2-version;/src/libkexiv2-&libkexiv2-version;.tar.xz">
-  <!ENTITY libkexiv2-download-ftp  "&kde-download-ftp;&libkexiv2-version;/src/libkexiv2-&libkexiv2-version;.tar.xz">
-  <!ENTITY libkexiv2-md5sum        "974e93e6693fc0367360281f650a91e4">
+  <!ENTITY libkexiv2-download-http "&kde-download-http;&kde-version;/src/libkexiv2-&kde-version;.tar.xz">
+  <!ENTITY libkexiv2-download-ftp  "&kde-download-ftp;&kde-version;/src/libkexiv2-&kde-version;.tar.xz">
+  <!ENTITY libkexiv2-md5sum        "c13a36a648bc5f69642dd6b7a36147fd">
   <!ENTITY libkexiv2-size          "130 KB">
   <!ENTITY libkexiv2-buildsize     "20 MB">
@@ -13 +13 @@
 ]>
 
-<sect1 id="libkexiv2" xreflabel="libkexiv2-&libkexiv2-version;">
+<sect1 id="libkexiv2" xreflabel="libkexiv2-&kde-version;">
   <?dbhtml filename="libkexiv2.html"?>
 
@@ -21 +21 @@
   </sect1info>
 
-  <title>libkexiv2-&libkexiv2-version;</title>
+  <title>libkexiv2-&kde-version;</title>
 
   <indexterm zone="libkexiv2">
@@ -62 +62 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/libkexiv2-&libkexiv2-version;-fixes-1.patch"/></para>
+        url="&patch-root;/libkexiv2-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -123 +123 @@
 
       <seglistitem>
-        <seg>None</seg>
+        <seg>none</seg>
         <seg>libkexiv2.so</seg>
-        <seg>None</seg>
+        <seg>&kde-dir;/include/libkexiv2 and &kde-dir;/share/apps/libkexiv2
+        </seg>
       </seglistitem>
     </segmentedlist>

kde/add/okular.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY okular-download-http "&kde-download-http;&okular-version;/src/okular-&okular-version;.tar.xz">
-  <!ENTITY okular-download-ftp  "&kde-download-ftp;&okular-version;/src/okular-&okular-version;.tar.xz">
-  <!ENTITY okular-md5sum        "4fa7a3edae4197cb93eb80653f184a26">
-  <!ENTITY okular-size          "1 MB">
-  <!ENTITY okular-buildsize     "131 MB">
+  <!ENTITY okular-download-http "&kde-download-http;&kde-version;/src/okular-&kde-version;.tar.xz">
+  <!ENTITY okular-download-ftp  "&kde-download-ftp;&kde-version;/src/okular-&kde-version;.tar.xz">
+  <!ENTITY okular-md5sum        "c843ff028ce65b8b7f52708bd2ed50b0">
+  <!ENTITY okular-size          "1.3 MB">
+  <!ENTITY okular-buildsize     "137 MB">
   <!ENTITY okular-time          "2.1 SBU">
 ]>
 
-<sect1 id="okular" xreflabel="okular-&okular-version;">
+<sect1 id="okular" xreflabel="okular-&kde-version;">
   <?dbhtml filename="okular.html"?>
 
@@ -21 +21 @@
   </sect1info>
 
-  <title>Okular-&okular-version;</title>
+  <title>Okular-&kde-version;</title>
 
   <indexterm zone="okular">
@@ -62 +62 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/okular-&okular-version;-fixes-1.patch"/></para>
+        url="&patch-root;/okular-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -138 +138 @@
         <seg>okular</seg>
         <seg>libokularcore.so and several in &kde-dir;/lib/kde4</seg>
-        <seg>several in &kde-dir;/include and &kde-dir;/share</seg>
+        <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
+        </seg>
       </seglistitem>
     </segmentedlist>

kde/core/attica.xml

@@ -112 +112 @@
 
       <seglistitem>
-        <seg>None</seg>
+        <seg>none</seg>
         <seg>libattica.so</seg>
         <seg>&kde-dir;/include/attica</seg>

kde/core/automoc4.xml

@@ -34 +34 @@
     <application>CMake</application> as the buildsystem.</para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -89 +89 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
-      .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; .. &amp;&amp;
 make</userinput></screen>
 

kde/core/config.xml

@@ -26 +26 @@
  first need to modify your <filename>.xinitrc</filename> file:</para>
     
-<screen><userinput>cat > ~/.xinitrc &lt;&lt;EOF
-# Begin .xinitrc
+<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; EOF
+<literal># Begin .xinitrc
 
 exec ck-launch-session dbus-launch --exit-with-session startkde
 
-# End .xinitrc
+# End .xinitrc</literal>
 EOF</userinput></screen>
 
@@ -45 +45 @@
     
     <para>KDE comes with a graphical login interface called KDM (the KDE Display 
-    Manager). KDM provides a customizable graphical login at boot. To use KDM, 
+    Manager), which provides a customizable graphical login at boot. To use KDM,
     you need to edit your <filename>/etc/inittab</filename> file (as the 
     <systemitem class="username">root</systemitem> user).
-    First, setup run-level 5 to start KDM by adding the following line (adjust 
+    First, setup run-level 5 to start KDM (adjust
     the path to kdm according to your system):</para>
     
-<screen><userinput>kd:5:respawn:&kde-dir;/bin/kdm</userinput></screen>
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; EOF
+<literal>kd:5:respawn:/opt/kde/bin/kdm</literal>
+EOF</userinput></screen>
 
-    <para>Additionally, you need to change the default run-level from 3 to 5. This 
-    is done by changing the line:</para>
+    <para>Additionally, you need to change the default run-level from 3 to 5:</para>
 
-<screen><userinput>id:3:initdefault:</userinput></screen>
+<screen><userinput>sed -i 's#id:3:initdefault:#id:5:initdefault:#' /etc/inittab</userinput></screen>
 
-    <para>To:</para>
-
-<screen><userinput>id:5:initdefault:</userinput></screen>
-  
-    <para>You can now restart your system and see the beautiful KDE login 
+    <para>You can now restart your system and see the KDE login
     screen.</para>
   

kde/core/core.xml

@@ -26 +26 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-icons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4libs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdelibs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-kde-agent.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4pimlibs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4runtime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4baseapps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepimlibs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kactivities.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4workspace.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-core.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-runtime.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-baseapps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-workspace.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
   

kde/core/kactivities.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kactivities-download-http "&kde-download-http;&kactivities-version;/src/kactivities-&kactivities-version;.tar.xz">
-  <!ENTITY kactivities-download-ftp  "&kde-download-ftp;&kactivities-version;/src/kactivities-&kactivities-version;.tar.xz">
-  <!ENTITY kactivities-md5sum        "9d7e66a832770558ad8641a8667e89ed">
-  <!ENTITY kactivities-size          "37 KB">
-  <!ENTITY kactivities-buildsize     "25.5 MB">
+  <!ENTITY kactivities-download-http "&kde-download-http;&kde-version;/src/kactivities-&kde-version;.tar.xz">
+  <!ENTITY kactivities-download-ftp  "&kde-download-ftp;&kde-version;/src/kactivities-&kde-version;.tar.xz">
+  <!ENTITY kactivities-md5sum        "aad068edbc3e30d108961e7d4e54dff5">
+  <!ENTITY kactivities-size          "81 KB">
+  <!ENTITY kactivities-buildsize     "49 MB">
   <!ENTITY kactivities-time          "0.5 SBU">
 ]>
 
-<sect1 id="kactivities" xreflabel="kactivities-&kactivities-version;">
+<sect1 id="kactivities" xreflabel="kactivities-&kde-version;">
   <?dbhtml filename="kactivities.html"?>
 
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kactivities-&kactivities-version;</title>
+  <title>Kactivities-&kde-version;</title>
 
   <indexterm zone="kactivities">
@@ -122 +122 @@
       <seglistitem>
         <seg>kactivitymanagerd</seg>
-        <seg>libactivities.so and activitymanager_plugin_*.so</seg>
-        <seg>&kde-dir;/include/kactivities and &kde-dir;/include/KDE/KActivities</seg>
+        <seg>libkactivities.so and several in &kde-dir;/lib/kde4</seg>
+        <seg>&kde-dir;/include/kactivities, &kde-dir;/include/KDE/KActivities
+        and several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>

kde/core/kde-baseapps.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdebaseapps-download-http "&kde-download-http;&kdebaseapps-version;/src/kde-baseapps-&kdebaseapps-version;.tar.xz">
-  <!ENTITY kdebaseapps-download-ftp  "&kde-download-ftp;&kdebaseapps-version;/src/kde-baseapps-&kdebaseapps-version;.tar.xz">
-  <!ENTITY kdebaseapps-md5sum        "c0a92dd1c23af86e07e2541f4a8bc07e">
-  <!ENTITY kdebaseapps-size          "2.5 MB">
-  <!ENTITY kdebaseapps-buildsize     "366 MB">
-  <!ENTITY kdebaseapps-time          "5.2 SBU">
+  <!ENTITY kde-baseapps-download-http "&kde-download-http;&kde-version;/src/kde-baseapps-&kde-version;.tar.xz">
+  <!ENTITY kde-baseapps-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-baseapps-&kde-version;.tar.xz">
+  <!ENTITY kde-baseapps-md5sum        "8373908889b2bb4e62344b09beaded66">
+  <!ENTITY kde-baseapps-size          "2.4 MB">
+  <!ENTITY kde-baseapps-buildsize     "398 MB">
+  <!ENTITY kde-baseapps-time          "5.2 SBU">
 ]>
 
-<sect1 id="kdebaseapps" xreflabel="kde-baseapps-&kdebaseapps-version;">
-  <?dbhtml filename="kde4baseapps.html"?>
+<sect1 id="kde-baseapps" xreflabel="kde-baseapps-&kde-version;">
+  <?dbhtml filename="kde-baseapps.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kdebaseapps-&kdebaseapps-version;</title>
+  <title>Kde-baseapps-&kde-version;</title>
 
-  <indexterm zone="kdebaseapps">
-    <primary sortas="a-kdebaseapps">kdebaseapps</primary>
+  <indexterm zone="kde-baseapps">
+    <primary sortas="a-kde-baseapps">kde-baseapps</primary>
   </indexterm>
 
@@ -39 +39 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&kdebaseapps-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&kde-baseapps-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&kdebaseapps-download-ftp;"/></para>
+        <para>Download (FTP): <ulink url="&kde-baseapps-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &kdebaseapps-md5sum;</para>
+        <para>Download MD5 sum: &kde-baseapps-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &kdebaseapps-size;</para>
+        <para>Download size: &kde-baseapps-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &kdebaseapps-buildsize;</para>
+        <para>Estimated disk space required: &kde-baseapps-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &kdebaseapps-time;</para>
+        <para>Estimated build time: &kde-baseapps-time;</para>
       </listitem>
     </itemizedlist>
@@ -63 +63 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kdebaseapps-&kdelibs-version;-fixes-1.patch"/></para>
+        url="&patch-root;/kde-baseapps-&kdelibs-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -81 +81 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="html-tidy"/>,
+    <xref linkend="html-tidy"/> and
     <xref linkend="glib2"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdebaseapps"/>
+    <ulink url="&blfs-wiki;/kde-baseapps"/>
     </para>
 
@@ -129 +129 @@
         kfmclient, konqueror, nspluginscan, nspluginviewer, servicemenudeinstallation and
         servicemenuinstallation</seg>
-        <seg>libkonq.so, libdolphinprivate.so, libkbookmarkmodel_private.so, 
-        libkdeinit4_keditbookmarks.so, libkonquerorprivate.so, libkonqsidebarplugin.so, 
-        libkdeinit4_dolphin.so and several in &kde-dir;/lib/kde4</seg>
-        <seg>...</seg>
+        <seg>libdolphinprivate.so, libkbookmarkmodel_private.so,
+        libkdeinit4_dolphin.so, libkdeinit4_keditbookmarks.so,
+        libkdeinit4_kfmclient.so, libkdeinit4_konqueror.so, libkonq.so,
+        libkonqsidebarplugin.so, libkonquerorprivate.so and several in
+        &kde-dir;/lib/kde4</seg>
+        <seg>several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
@@ -141 +143 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kdebaseapps">
-        <term><command>kdebaseapps</command></term>
+      <varlistentry id="a-kde-baseapps">
+        <term><command>kde-baseapps</command></term>
         <listitem>
-          <para>is a testing utility for kdebaseapps-generated build trees.</para>
-          <indexterm zone="a-kdebaseapps kdebaseapps">
-            <primary sortas="b-kdebaseapps">kdelibs</primary>
+          <para>is a testing utility for kde-baseapps-generated build trees.</para>
+          <indexterm zone="a-kde-baseapps kde-baseapps">
+            <primary sortas="b-kde-baseapps">kdelibs</primary>
           </indexterm>
         </listitem>

kde/core/kde-runtime.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kderuntime-download-http "&kde-download-http;&kderuntime-version;/src/kde-runtime-&kderuntime-version;.tar.xz">
-  <!ENTITY kderuntime-download-ftp  "&kde-download-ftp;&kderuntime-version;/src/kde-runtime-&kderuntime-version;.tar.xz">
-  <!ENTITY kderuntime-md5sum        "aa22e3d4166e8cd0f149ac5dd5989301">
-  <!ENTITY kderuntime-size          "5.6 MB">
-  <!ENTITY kderuntime-buildsize     "548 MB">
-  <!ENTITY kderuntime-time          "7.5 SBU">
+  <!ENTITY kde-runtime-download-http "&kde-download-http;&kde-version;/src/kde-runtime-&kde-version;.tar.xz">
+  <!ENTITY kde-runtime-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-runtime-&kde-version;.tar.xz">
+  <!ENTITY kde-runtime-md5sum        "52149a5030efde91933407bf4ca728c9">
+  <!ENTITY kde-runtime-size          "6.1 MB">
+  <!ENTITY kde-runtime-buildsize     "438 MB">
+  <!ENTITY kde-runtime-time          "7.5 SBU">
 ]>
 
-<sect1 id="kderuntime" xreflabel="kde-runtime-&kderuntime-version;">
-  <?dbhtml filename="kde4runtime.html"?>
+<sect1 id="kde-runtime" xreflabel="kde-runtime-&kde-version;">
+  <?dbhtml filename="kde-runtime.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kde-runtime-&kderuntime-version;</title>
+  <title>Kde-runtime-&kde-version;</title>
 
-  <indexterm zone="kderuntime">
-    <primary sortas="a-kderuntime">kderuntime</primary>
+  <indexterm zone="kde-runtime">
+    <primary sortas="a-kde-runtime">kde-runtime</primary>
   </indexterm>
 
@@ -38 +38 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&kderuntime-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&kde-runtime-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&kderuntime-download-ftp;"/></para>
+        <para>Download (FTP): <ulink url="&kde-runtime-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &kderuntime-md5sum;</para>
+        <para>Download MD5 sum: &kde-runtime-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &kderuntime-size;</para>
+        <para>Download size: &kde-runtime-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &kderuntime-buildsize;</para>
+        <para>Estimated disk space required: &kde-runtime-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &kderuntime-time;</para>
+        <para>Estimated build time: &kde-runtime-time;</para>
       </listitem>
     </itemizedlist>
@@ -62 +62 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kde-runtime-&kderuntime-version;-rpc_fix-1.patch"/></para>
+        url="&patch-root;/kde-runtime-&kde-version;-rpc_fix-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -70 +70 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/> and
+    <xref linkend="kactivities"/> and
     <xref linkend="libtirpc"/>
     </para>
@@ -76 +76 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+    <xref linkend="nepomuk-core"/>,
     <xref linkend="alsa-lib"/>,
     <xref linkend="libjpeg"/> and 
@@ -95 +96 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kderuntime"/>
+    <ulink url="&blfs-wiki;/kde-runtime"/>
     </para>
 
@@ -103 +104 @@
     <title>Installation of Kde-runtime</title>
 
-    <para>Install <application>kderuntime</application> by running the following
+    <para>Install <application>kde-runtime</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../kde-runtime-&kderuntime-version;-rpc_fix-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../kde-runtime-&kde-version;-rpc_fix-1.patch &amp;&amp;
 mkdir build &amp;&amp;
 cd build &amp;&amp;
@@ -123 +124 @@
     <title>Command Explanations</title>
 
- <para><option>patch -Np1 -i ../kde-runt...</option>: This patch fixes linking 
- to <application>libtirpc</application>.</para>
+ <para><option>patch -Np1 -i ../kde-runtime-&kde-version;-rpc_fix-1.patch</option>:
+ This patch fixes linking to <application>libtirpc</application>.</para>
 
   </sect2>
@@ -137 +138 @@
 
       <seglistitem>
-        <seg>kcmshell4, kde4, kde4-menu, kdebugdialog, kde-cp, keditfiletype, 
-        kde-mv, kde-open, kfile4, kglobalaccel, khelpcenter, khotnewstuff4, 
-        khotnewstuff-upload, kiconfinder, kioclient, kmimetypefinder, knotify4, 
-        kreadconfig, ksvgtopng, ktraderclient, ktrash, kwriteconfig, kquitapp, 
-        kstart, kuiserver, kwalletd, nepomukbackup, nepomukcontroller, nepomukindexer, 
-        nepomukserver, nepomukservicestub and nepomuk-simpleresource-rcgen, plasmapkg, 
-        plasma-remote-helper and solid-hardware</seg>
+        <seg>kcmshell4, kde-cp, kde-mv, kde-open, kde4, kde4-menu,
+        kdebugdialog, keditfiletype, kfile4, kglobalaccel, khelpcenter,
+        khotnewstuff-upload, khotnewstuff4, kiconfinder, kioclient,
+        kmimetypefinder, knotify4, kquitapp, kreadconfig, kstart, ksvgtopng,
+        ktraderclient, ktrash, kuiserver, kwalletd, kwriteconfig,
+        nepomukcontroller, plasma-remote-helper, plasmapkg and solid-hardware.
+        </seg>
         <seg>several in &kde-dir;/lib</seg>
-        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
+        <seg>several in &kde-dir;/lib and &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
@@ -154 +155 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kderuntime">
-        <term><command>kderuntime</command></term>
+      <varlistentry id="a-kde-runtime">
+        <term><command>kde-runtime</command></term>
         <listitem>
-          <para>is a testing utility for kderuntime-generated build trees.</para>
-          <indexterm zone="a-kderuntime kderuntime">
-            <primary sortas="b-kderuntime">kdelibs</primary>
+          <para>is a testing utility for kde-runtime-generated build trees.</para>
+          <indexterm zone="a-kde-runtime kde-runtime">
+            <primary sortas="b-kde-runtime">kdelibs</primary>
           </indexterm>
         </listitem>

kde/core/kde-workspace.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdeworkspace-download-http "&kde-download-http;&kdeworkspace-version;/src/kde-workspace-&kdeworkspace-version;.tar.xz">
-  <!ENTITY kdeworkspace-download-ftp  "&kde-download-ftp;&kdeworkspace-version;/src/kde-workspace-&kdeworkspace-version;.tar.xz">
-  <!ENTITY kdeworkspace-md5sum        "615a05d12337a0cba749951891e60513">
-  <!ENTITY kdeworkspace-size          "32.5 MB">
-  <!ENTITY kdeworkspace-buildsize     "1.5 GB">
-  <!ENTITY kdeworkspace-time          "20 SBU">
+  <!ENTITY kde-workspace-download-http "&kde-download-http;&kde-version;/src/kde-workspace-&kde-version;.tar.xz">
+  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-workspace-&kde-version;.tar.xz">
+  <!ENTITY kde-workspace-md5sum        "881d9f25e7718ff72cfc40a4bff05dca">
+  <!ENTITY kde-workspace-size          "21.3 MB">
+  <!ENTITY kde-workspace-buildsize     "1.4 GB">
+  <!ENTITY kde-workspace-time          "20 SBU">
 ]>
 
-<sect1 id="kdeworkspace" xreflabel="kde-workspace-&kdeworkspace-version;">
-  <?dbhtml filename="kde4workspace.html"?>
+<sect1 id="kde-workspace" xreflabel="kde-workspace-&kde-version;">
+  <?dbhtml filename="kde-workspace.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kde-workspace-&kdeworkspace-version;</title>
+  <title>Kde-workspace-&kde-version;</title>
 
-  <indexterm zone="kdeworkspace">
-    <primary sortas="a-kdeworkspace">kdeworkspace</primary>
+  <indexterm zone="kde-workspace">
+    <primary sortas="a-kde-workspace">kde-workspace</primary>
   </indexterm>
 
@@ -40 +40 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&kdeworkspace-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&kde-workspace-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&kdeworkspace-download-ftp;"/></para>
+        <para>Download (FTP): <ulink url="&kde-workspace-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &kdeworkspace-md5sum;</para>
+        <para>Download MD5 sum: &kde-workspace-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &kdeworkspace-size;</para>
+        <para>Download size: &kde-workspace-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &kdeworkspace-buildsize;</para>
+        <para>Estimated disk space required: &kde-workspace-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &kdeworkspace-time;</para>
+        <para>Estimated build time: &kde-workspace-time;</para>
       </listitem>
     </itemizedlist>
@@ -64 +64 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kdeworkspace-&kde4-version;-fixes-1.patch"/></para>
+        url="&patch-root;/kde-workspace-&kde4-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -72 +72 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>, 
     <xref linkend="kactivities"/> and
     <xref linkend="qimageblitz"/>
@@ -102 +101 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdeworkspace"/>
+    <ulink url="&blfs-wiki;/kde-workspace"/>
     </para>
 
@@ -144 +143 @@
 
       <seglistitem>
-        <seg>genkdmconf, kaccess, kapplymousetheme, kblankscrn.kss, kcheckrunning, 
-        kcminit, kcminit_startup, kdm, kdmctl, kdostartupconfig4, kfontview, 
-        kfontinst, kinfocenter, klipper, kmenuedit, krandom.kss, krandrtray, 
-        krunner, ksmserver, ksplashqml, ksplashsimple, ksplashx, ksplashx_scale, 
-        kstartupconfig4, ksysguard, ksysguardd, ksystraycmd, kwin, kwrited, oxygen-demo, 
-        oxygen-settings, oxygen-shadow-demo, plasma-desktop, plasmaengineexplorer, 
-        plasmawallpaperviewer, plasma-windowed, plasmoidviewer, solid-network, 
-        solid-action-desktop-gen, startkde and systemsettings</seg>
+        <seg>genkdmconf, kaccess, kapplymousetheme, kblankscrn.kss,
+        kcheckrunning, kcminit, kcminit_startup, kdm, kdmctl,
+        kdostartupconfig4, kfontinst, kfontview, kinfocenter, klipper,
+        kmenuedit, krandom.kss, krandrstartup, krandrtray, krdb, krunner,
+        ksmserver, ksplashqml, ksplashsimple, ksplashx, ksplashx_scale,
+        kstartupconfig4, ksysguard, ksysguardd, ksystraycmd, kwin, kwrited,
+        oxygen-demo, oxygen-settings, oxygen-shadow-demo, plasma-desktop,
+        plasma-netbook, plasma-overlay, plasma-windowed, plasmaengineexplorer,
+        plasmawallpaperviewer, plasmoidviewer, remote-widgets-browser,
+        solid-action-desktop-gen, solid-network, startkde and systemsettings
+        </seg>
         <seg>several in &kde-dir;/lib</seg>
-        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
+        <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
+        </seg>
       </seglistitem>
     </segmentedlist>

kde/core/kdelibs.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdelibs-download-http "&kde-download-http;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
-  <!ENTITY kdelibs-download-ftp  "&kde-download-ftp;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
-  <!ENTITY kdelibs-md5sum        "c4987c838164bd9ee2787e77243fe4a9">
-  <!ENTITY kdelibs-size          "11.4 MB">
+  <!ENTITY kdelibs-download-http "&kde-download-http;&kde-version;/src/kdelibs-&kde-version;.tar.xz">
+  <!ENTITY kdelibs-download-ftp  "&kde-download-ftp;&kde-version;/src/kdelibs-&kde-version;.tar.xz">
+  <!ENTITY kdelibs-md5sum        "976adc970ad685661494ae17784c2111">
+  <!ENTITY kdelibs-size          "11 MB">
   <!ENTITY kdelibs-buildsize     "1.7 GB">
   <!ENTITY kdelibs-time          "24 SBU">
 ]>
 
-<sect1 id="kdelibs" xreflabel="kdelibs-&kdelibs-version;">
-  <?dbhtml filename="kde4libs.html"?>
+<sect1 id="kdelibs" xreflabel="kdelibs-&kde-version;">
+  <?dbhtml filename="kdelibs.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kdelibs-&kdelibs-version;</title>
+  <title>Kdelibs-&kde-version;</title>
 
   <indexterm zone="kdelibs">
@@ -62 +62 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kde4libs-&kdelibs-version;-fixes-1.patch"/></para>
+        url="&patch-root;/kde4libs-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -156 +156 @@
 
       <seglistitem>
-        <seg>checkXML, kbuildsycoca4, kconfig_compiler, kcookiejar4, kde4-config, 
-        kded4, kdeinit4, kdeinit4_shutdown, kdeinit4_wrapper, kfilemetadatareader, kjs, kjscmd, kross, 
-        kshell4, kunittestmodrunner, kwrapper4, makekdewidgets, meinproc4, 
-        meinproc_simple, nepomuk-rcgen and preparetips</seg>
+        <seg>checkXML, kbuildsycoca4, kconfig_compiler, kcookiejar4,
+        kde4-config, kded4, kdeinit4, kdeinit4_shutdown, kdeinit4_wrapper,
+        kfilemetadatareader, kjs, kjscmd, kross, kshell4, kunittestmodrunner,
+        kwrapper4, makekdewidgets, meinproc4, meinproc4_simple, nepomuk-rcgen
+        and preparetips</seg>
         <seg>several in &kde-dir;/lib</seg>
-        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
+        <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
+        </seg>
       </seglistitem>
     </segmentedlist>

kde/core/kdepimlibs.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdepimlibs-download-http "&kde-download-http;&kdepimlibs-version;/src/kdepimlibs-&kdepimlibs-version;.tar.xz">
-  <!ENTITY kdepimlibs-download-ftp  "&kde-download-ftp;&kdepimlibs-version;/src/kdepimlibs-&kdepimlibs-version;.tar.xz">
-  <!ENTITY kdepimlibs-md5sum        "30c54a75ea9654f13f96174087ab6fc3">
-  <!ENTITY kdepimlibs-size          "2.6 MB">
-  <!ENTITY kdepimlibs-buildsize     "531 MB">
+  <!ENTITY kdepimlibs-download-http "&kde-download-http;&kde-version;/src/kdepimlibs-&kde-version;.tar.xz">
+  <!ENTITY kdepimlibs-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepimlibs-&kde-version;.tar.xz">
+  <!ENTITY kdepimlibs-md5sum        "08d0b45665b80d23530d0555d2cf67bd">
+  <!ENTITY kdepimlibs-size          "2.5 MB">
+  <!ENTITY kdepimlibs-buildsize     "518 MB">
   <!ENTITY kdepimlibs-time          "7.5 SBU">
 ]>
 
-<sect1 id="kdepimlibs" xreflabel="kdepimlibs-&kdepimlibs-version;">
-  <?dbhtml filename="kde4pimlibs.html"?>
+<sect1 id="kdepimlibs" xreflabel="kdepimlibs-&kde-version;">
+  <?dbhtml filename="kdepimlibs.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>Kdepimlibs-&kdepimlibs-version;</title>
+  <title>Kdepimlibs-&kde-version;</title>
 
   <indexterm zone="kdepimlibs">
@@ -62 +62 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/kdepimlibs-&kdepimlibs-version;-fixes-1.patch"/></para>
+        url="&patch-root;/kdepimlibs-&kde-version;-fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -131 +131 @@
       <seglistitem>
         <seg>none</seg>
-        <seg>several in &kde-dir;/lib</seg>
-        <seg>several in &kde-dir;/include</seg>
+        <seg>several in &kde-dir;/lib</seg>
+        <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
+        </seg>
       </seglistitem>
     </segmentedlist>

kde/core/oxygen-icons.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY oxygen-icons-download-http "&kde-download-http;&oxygen-icons-version;/src/oxygen-icons-&oxygen-icons-version;.tar.xz">
-  <!ENTITY oxygen-icons-download-ftp  "&kde-download-ftp;&oxygen-icons-version;/src/oxygen-icons-&oxygen-icons-version;.tar.xz">
-  <!ENTITY oxygen-icons-md5sum        "cb41c615f3419f2560e92dae85e8ee04">
-  <!ENTITY oxygen-icons-size          "296 MB">
-  <!ENTITY oxygen-icons-buildsize     "460 MB">
+  <!ENTITY oxygen-icons-download-http "&kde-download-http;&kde-version;/src/oxygen-icons-&kde-version;.tar.xz">
+  <!ENTITY oxygen-icons-download-ftp  "&kde-download-ftp;&kde-version;/src/oxygen-icons-&kde-version;.tar.xz">
+  <!ENTITY oxygen-icons-md5sum        "855461ba8383c9870f7ffc74f2fbd76e">
+  <!ENTITY oxygen-icons-size          "266 MB">
+  <!ENTITY oxygen-icons-buildsize     "411 MB">
   <!ENTITY oxygen-icons-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="oxygen-icons" xreflabel="oxygen-icons-&oxygen-icons-version;">
+<sect1 id="oxygen-icons" xreflabel="oxygen-icons-&kde-version;">
   <?dbhtml filename="oxygen-icons.html"?>
 
@@ -21 +21 @@
   </sect1info>
 
-  <title>Oxygen-icons-&oxygen-icons-version;</title>
+  <title>Oxygen-icons-&kde-version;</title>
 
   <indexterm zone="oxygen-icons">

kde/core/phonon-backend-gstreamer.xml

@@ -61 +61 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="phonon"/>,
+    <xref linkend="phonon"/> and
     <xref linkend="gstreamer"/> 
     </para>
@@ -69 +69 @@
     <xref linkend="gst-plugins-base"/> (needed for output to ALSA),
     <xref linkend="gst-plugins-good"/> (needed for output to PulseAudio),
-    <xref linkend="gst-plugins-bad"/> (needed for AAC/M4A support),
+    <xref linkend="gst-plugins-bad"/> (needed for AAC/M4A support) and
     <xref linkend="gst-plugins-ugly"/> (needed for MP3 support)
     </para>

kde/core/phonon-backend-vlc.xml

@@ -33 +33 @@
     utilizes the <application>VLC</application> media framework.</para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71 +71 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="phonon"/>,
+    <xref linkend="phonon"/> and
     <xref linkend="vlc"/>
     </para>

kde/core/phonon.xml

@@ -32 +32 @@
     <para><application>Phonon</application> is the multimedia API for KDE4.
     It replaces the old <application>aRts</application>, that is no longer
-    supported by KDE. It supports backends like GStreamer and VLC.</para>
+    supported by KDE. Phonon needs either the GStreamer or VLC backend.</para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72 +72 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="automoc4"/>,
+    <xref linkend="automoc4"/> and
     <xref linkend="glib2"/>
     </para>
@@ -78 +78 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend='pulseaudio'/>, 
-      <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
+    <xref linkend='pulseaudio'/> and
+    <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
     </para>   
     

kde/core/polkit-qt.xml

@@ -33 +33 @@
     <application>polkit</application> in the Qt environment.</para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -83 +83 @@
     <title>Installation of Polkit-Qt</title>
 
-    <para>Install <application>polkit-qt</application> by running the following
+    <para>Install <application>Polkit-Qt</application> by running the following
     commands:</para>
 
@@ -114 +114 @@
 
       <seglistitem>
-        <seg>None</seg>
+        <seg>none</seg>
         <seg>libpolkit-qt-agent-1.so, libpolkit-qt-core-1.so and libpolkit-qt-gui-1.so</seg>
         <seg>&kde-dir;/include/polkit-qt-1</seg>

kde/core/qimageblitz.xml

@@ -33 +33 @@
     filter library for <application>KDE</application>.</para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82 +82 @@
     <title>Installation of QImageblitz</title>
 
-    <para>Install <application>qimageblitz</application> by running the following
+    <para>Install <application>QImageblitz</application> by running the following
     commands:</para>
 

kde/core/shrdesktopontologies.xml

@@ -98 +98 @@
     <title>Installation of Shared-desktop-ontologies</title>
 
-    <para>Install <application>shared-desktop-ontologies</application> by running the following
+    <para>Install <application>Shared-desktop-ontologies</application> by running the following
     commands:</para>
 
@@ -127 +127 @@
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
+        <seg>none</seg>
+        <seg>none</seg>
         <seg>&kde-dir;/share/ontology</seg>
       </seglistitem>

kde/intro/introduction.xml

@@ -16 +16 @@
   <title>Introduction</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4-intro.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
 

kde/intro/pre-install-config.xml

@@ -39 +39 @@
     system or personal profile:</para>
 
-<screen><userinput>cat &gt; /etc/profile.d/kde.sh &lt;&lt; "EOF"
-# Begin /etc/profile.d/kde.sh
+<screen><userinput>cat &gt; /etc/profile.d/kde.sh &lt;&lt; EOF
+<literal># Begin /etc/profile.d/kde.sh
 
 &kde-dir-var;=/opt/kde
@@ -53 +53 @@
 export &kde-dir-var; KDEDIR
 
-# End /etc/profile.d/kde.sh
+# End /etc/profile.d/kde.sh</literal>
 EOF
 </userinput></screen>
@@ -59 +59 @@
     <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
 
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
 <literal># Begin kde addition
 
@@ -87 +87 @@
   
 <screen role="root"><userinput>mkdir -pv /etc/dbus-1 &amp;&amp;
-cat &gt; /etc/dbus-1/system-local.conf &lt;&lt; "EOF"
+cat &gt; /etc/dbus-1/system-local.conf &lt;&lt; EOF
 <literal>&lt;!DOCTYPE busconfig PUBLIC
  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"

kde/kde.xml

@@ -11 +11 @@
 -->
 
-<part id="kde4" xreflabel="KDE">
-  <?dbhtml filename="kde4.html" dir="kde4"?>
+<part id="kde" xreflabel="KDE">
+  <?dbhtml filename="kde.html" dir="kde"?>
 
   <title>KDE</title>