Index: index.xml
===================================================================
--- index.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ index.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-20040123">
-<!ENTITY releasedate "January 23rd, 2004">
+<!ENTITY version "CVS-20040124">
+<!ENTITY releasedate "January 24th, 2004">
 <!ENTITY blfs-version "cvs">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ introduction/welcome/changelog.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -11,4 +11,7 @@
 
 <itemizedlist>
+
+<listitem><para>January 24th, 2003 [igor]: Updated to
+KDE-3.1.5.</para></listitem>
 
 <listitem><para>January 23rd, 2003 [igor]: Updated to
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/core/arts.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -21,9 +21,7 @@
 <sect4><title>Required</title>
 <para><xref linkend="qt"/></para></sect4>
-<sect4><title>Recommended</title>
-<para><xref linkend="alsa"/>, <xref linkend="audiofile"/> and <xref
-linkend="libvorbis"/></para></sect4> 
 <sect4><title>Optional</title>
-<para><xref linkend="pkgconfig"/>, <xref
+<para><xref linkend="alsa"/>, <xref linkend="audiofile"/>, <xref
+linkend="libvorbis"/>, <xref linkend="pkgconfig"/>, <xref
 linkend="GLib2"/> and <xref linkend="libmad"/></para></sect4>
 </sect3>
@@ -42,10 +40,10 @@
 
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-     --disable-dependency-tracking &amp;&amp;
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
 ln -sfn &kde-dir; /opt/kde</command></userinput></screen>
 
-<note><para>Another configure option is <command>--enable-final</command>. 
+<note><para>Another configure option is <parameter>--enable-final</parameter>. 
 This option can speed up the build process, but requires a lot of memory.  If
 you have less than 256MB of RAM, this option may cause swapping and 
@@ -55,21 +53,21 @@
 
 <sect2><title>Command explanations</title>
-<para><command>--prefix=&kde-dir;</command> : This option tells the
+<para><parameter>--prefix=&kde-dir;</parameter> : This option tells the
 process to install the package in <filename
 class="directory">&kde-dir;</filename>. We put aRts here because this
 package is required before installing <acronym>KDE</acronym>.</para>
 
-<para><command>--disable-debug</command> : This option causes the
+<para><parameter>--disable-debug</parameter> : This option causes the
 system to be compiled without debugging code.
 </para>
 
-<para><command>--disable-dependency-tracking</command> : This option speeds
+<para><parameter>--disable-dependency-tracking</parameter> : This option speeds
 up one time builds.</para>
 
-<para><command>ln -sfn &kde-dir; /opt/kde</command> : This command creates
+<para><command>ln -sfn &kde-dir; /opt/kde</command> : This parameter creates
 a link for access to <acronym>KDE</acronym>. If a newer version of
 <acronym>KDE</acronym> is released, the new
-system can be built by changing the <command>--prefix</command> location
-and then set up by changing the link as this command does.
+system can be built by changing the <parameter>--prefix</parameter> location
+and then set up by changing the link as this parameter does.
 </para>
 
Index: kde/inst/kde-addons.xml
===================================================================
--- kde/inst/kde-addons.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/inst/kde-addons.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -7,5 +7,6 @@
 
 <para><application>kdeaddons</application> contains additional plugins 
-and scripts for some <acronym>KDE</acronym> applications.</para>
+and scripts for some <acronym>KDE</acronym> applications. This package
+should be compiled last.</para>
 
 <sect3><title>Package information</title>
@@ -19,6 +20,9 @@
 
 <sect3><title><application>kdeaddons</application> dependencies</title>
-<sect4><title>Recommended</title>
-<para><xref linkend="kde-multimedia"/> and <xref linkend="kde-network"/>
+<sect4><title>Required</title>
+<para><xref linkend="kde-base"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="xmms"/> and <xref linkend="SDL"/>
 </para></sect4>
 </sect3>
Index: kde/inst/kde-admin.xml
===================================================================
--- kde/inst/kde-admin.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/inst/kde-admin.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -31,15 +31,7 @@
 <para>Install <application>kdeadmin</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking --with-shadow &amp;&amp;
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><command>--with-shadow</command> : This option allows use of 
-shadow passwords.</para>
 
 </sect2>
Index: kde/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/inst/kde-base.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -19,11 +19,20 @@
 
 <sect3><title><application>kdebase</application> dependencies</title>
-<sect4><title>Recommended</title>
-<para><xref linkend="openssl"/>, <xref linkend="lesstif"/>, <xref
-linkend="CDParanoia"/>, <xref linkend="libvorbis"/> and <xref
-linkend="cups"/></para></sect4>
+<sect4><title>Required</title>
+<para><xref linkend="kde-libs"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="lame"/> and <xref
-linkend="Linux_PAM"/></para></sect4>
+<para>
+<xref linkend="openssl"/>,
+<xref linkend="lesstif"/>,
+<xref linkend="Linux_PAM"/>,
+<xref linkend="openldap"/>,
+<xref linkend="libtiff"/>,
+<xref linkend="j2sdk"/>,
+<xref linkend="samba"/>,
+<xref linkend="pkgconfig"/>,
+<ulink url="http://www.pdc.kth.se/kth-krb/">KTH Kerberos</ulink>,
+<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink> and
+<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
+</para></sect4>
 </sect3>
 
@@ -33,26 +42,17 @@
 <title>Installation of <application>kdebase</application></title>
 
+<!--
 <para>Check to see if <filename class="libraryfile">/lib/libmisc.la</filename> 
 exists. If not, run:</para>
 <screen><userinput><command>ln -sf /usr/lib/libmisc.la /lib/libmisc.la</command>
 </userinput></screen>
+-->
 
 <para>Install kdebase with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-     --disable-dependency-tracking --disable-lametest --with-shadow &amp;&amp;
+    --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
 
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
- 
-<para><command>--disable-lametest</command> : Do not search for and use 
-lame support. This package provides <filename>MP3</filename> encoding. Omit this option if
-you installed <filename>lame</filename>.</para>
-  
-<para><command>--with-shadow</command> : Use shadow password 
-support.</para>
 </sect2>
 
Index: kde/inst/kde-graphics.xml
===================================================================
--- kde/inst/kde-graphics.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/inst/kde-graphics.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -17,8 +17,15 @@
 <sect3><title><application>kdegraphics</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="kde-base"/> and <xref linkend="which"/>
+<para><xref linkend="kde-base"/>
 </para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="imlib"/> and <xref linkend="sane"/></para></sect4>
+<para>
+<xref linkend="imlib"/>,
+<xref linkend="sane"/>,
+<xref linkend="libtiff"/>,
+<xref linkend="xpdf"/>,
+<xref linkend="pst-typesetting-tex"/> and
+<ulink url="http://www.gphoto.org/">gPhoto2</ulink>
+</para></sect4>
 </sect3>
 
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/inst/kde-libs.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -23,10 +23,12 @@
 <sect4><title>Required</title>
 <para><xref linkend="kde-core-arts"/></para></sect4>
-<sect4><title>Recommended</title>
+<sect4><title>Optional</title>
 <para><xref linkend="openssl"/>, <xref linkend="pcre"/>, <xref
 linkend="libxml2"/>, <xref linkend="libxslt"/>, <xref
-linkend="libfam"/> and <xref linkend="libart_lgpl"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="cups"/>, <xref linkend="sane"/> and <xref linkend="openldap"/>
+linkend="libfam"/>, <xref linkend="libart_lgpl"/>,
+<xref linkend="cups"/>, <xref linkend="openldap"/>, <xref
+linkend="alsa"/>, <xref linkend="libtiff"/>,
+<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink>
+and <ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
 </para></sect4>
 </sect3>
@@ -45,5 +47,5 @@
 <para>Install <application>kdelibs</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-     --disable-dependency-tracking --with-alsa --enable-fast-malloc=full &amp;&amp;
+    --disable-dependency-tracking --enable-fast-malloc=full --disable-pcre &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
@@ -52,20 +54,22 @@
 
 <sect2><title>Command explanations</title>
-<para><command>--prefix=&kde-dir;</command> : This option tells
+<para><parameter>--prefix=&kde-dir;</parameter> : This option tells
 the process to install the package in <filename
 class="directory">&kde-dir;</filename>.</para>
 
-<para><command>--disable-debug</command> : This option causes the
+<para><parameter>--disable-debug</parameter> : This option causes the
 system to be compiled without debugging code.</para>
 
-<para><command>--disable-dependency-tracking</command> : This option
+<para><parameter>--disable-dependency-tracking</parameter> : This option
 speeds up one time builds.</para>
 
-<para><command>--with-alsa</command> : This option tells the build process to
-search for and use Alsa for sound support.</para>
-
-<para><command>--enable-fast-malloc=full</command> : This option tells
+<para><parameter>--enable-fast-malloc=full</parameter> : This option tells
 <acronym>KDE</acronym> programs to use an internal memory allocation scheme 
 optimized for <acronym>KDE</acronym>.</para>
+
+<para><parameter>--disable-pcre</parameter> : Omit this switch if you
+have <acronym>PCRE</acronym> installed and you want improved regular expression support
+in the <acronym>KDE</acronym> JavaScript engine.</para>
+
 </sect2>
 
Index: kde/inst/kde-multimedia.xml
===================================================================
--- kde/inst/kde-multimedia.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/inst/kde-multimedia.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -19,4 +19,22 @@
 <para><xref linkend="kde-base"/>
 </para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="alsa"/>,
+<xref linkend="CDParanoia"/>,
+<xref linkend="lame"/>,
+<xref linkend="audiofile"/>,
+<xref linkend="esound"/>,
+<xref linkend="nas"/>,
+<xref linkend="slang"/>,
+<xref linkend="lesstif"/>,
+<xref linkend="tk"/>,
+<xref linkend="GTK"/>,
+<xref linkend="libogg"/>,
+<xref linkend="libvorbis"/>,
+<xref linkend="xine-lib"/>,
+<xref linkend="libtiff"/> and
+<ulink url="http://xanim.polter.net/home.html">XAnim</ulink>
+</para></sect4>
 </sect3>
 
@@ -28,8 +46,9 @@
 <para>Install <application>kdemultimedia</application> with:</para>
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking --with-arts-alsa &amp;&amp;
-  sed -i -e 's/strings -ansi/strings/' kaudiocreator/Makefile &amp;&amp;
-  sed -i -e 's/strings -ansi/strings/' kioslave/audiocd/Makefile &amp;&amp;
-  sed -i -e 's/-ansi//' kscd/libwm/Makefile &amp;&amp;
+    --disable-dependency-tracking &amp;&amp;
+sed -i -e 's/strings -ansi/strings/' kaudiocreator/Makefile &amp;&amp;
+sed -i -e 's/strings -ansi/strings/' kioslave/audiocd/Makefile &amp;&amp;
+sed -i -e 's/-ansi//' kscd/libwm/Makefile &amp;&amp;
+sed -i -e 's/-pedantic//' mpeglib/lib/input/Makefile &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
@@ -40,20 +59,20 @@
 <title>Command explanations</title>
 
-<para><command>--with-arts-alsa</command> : Use the
-<application><acronym>ALSA</acronym></application> support built 
-into <application><acronym>aRts</acronym></application>.</para>
-
 <para><command>sed -i -e 's/strings -ansi/strings/' kaudiocreator/Makefile</command> : 
-Remove -ansi from <application>gcc</application> parameters to work around
-a broken header in the kernel.  The broken file is asm/byteorder.h, where
-a parameter is used, but not defined, when -ansi is specified.</para>
+Remove <parameter>-ansi</parameter> from <application>gcc</application> parameters to work around
+a broken header in the kernel.  The broken file is <filename>asm/byteorder.h</filename>, where
+a parameter is used, but not defined, when <parameter>-ansi</parameter> is specified.</para>
 
 <para><command>sed -i -e 's/strings -ansi/strings/' kioslave/audiocd/Makefile</command> : 
-Remove -ansi from <application>gcc</application> parameters to work around
+Remove <parameter>-ansi</parameter> from <application>gcc</application> parameters to work around
 a broken header in the kernel.</para>
 
 <para><command>sed -i -e 's/-ansi//' kscd/libwm/Makefile</command> : 
-Remove -ansi from <application>gcc</application> parameters to work around
+Remove <parameter>-ansi</parameter> from <application>gcc</application> parameters to work around
 a broken header in the kernel.</para>
+
+<para><command>sed -i -e 's/-pedantic//' mpeglib/lib/input/Makefile</command> :
+Remove <parameter>-pedantic</parameter> from <application>gcc</application>
+parameters to work around a broken header in the kernel.</para>
 
 </sect2>
@@ -69,5 +88,5 @@
 etc):
 <screen><userinput><command>cd /dev &amp;&amp;
-ln -s "CD Drive" /dev/cdrom</command></userinput></screen>
+ln -s <replaceable>[CD Drive]</replaceable> /dev/cdrom</command></userinput></screen>
 </para>
 
Index: kde/inst/kde-network.xml
===================================================================
--- kde/inst/kde-network.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/inst/kde-network.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -19,4 +19,11 @@
 <para><xref linkend="kde-base"/>
 </para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="ppp"/>,
+<xref linkend="samba"/>,
+<xref linkend="libtiff"/> and
+<ulink url="http://www.openslp.org/">OpenSLP</ulink>
+</para></sect4>
 </sect3>
 
@@ -37,5 +44,5 @@
 <title>Configuring kdenetwork</title>
 
-<para>There is no explicit configuration for the kde network package, however 
+<para>There is no explicit configuration for the kdenetwork package, however 
 individual packages need to be set up with user information.
 </para>
Index: kde/inst/kde-pim.xml
===================================================================
--- kde/inst/kde-pim.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/inst/kde-pim.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -20,6 +20,9 @@
 </para></sect4>
 <sect4><title>Optional</title>
-<para><ulink
-url="http://www.slac.com/pilone/kpilot_home">pilot-link</ulink>
+<para>
+<ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>,
+<ulink url="http://www.pilot-link.org/">pilot-link</ulink>,
+<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink> and
+<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
 </para></sect4>
 </sect3>
Index: kde/kde-intro.xml
===================================================================
--- kde/kde-intro.xml	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/kde-intro.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -3,5 +3,5 @@
 
 <para><acronym>KDE</acronym> is a comprehensive desktop environment that builds on 
-<productname>XFree86</productname> and <productname>QT</productname> to provide
+<application>XFree86</application> and <application>Qt</application> to provide
 a window manager and many user tools, including a browser, word processor, 
 spreadsheet, presentation package, games, and numerous other utilities. It 
@@ -14,8 +14,8 @@
 
 <para>As the instructions for compiling and installing <acronym>KDE</acronym> were developed,
-the options to <filename>configure</filename> were examined and the parameters
+the options to <command>configure</command> were examined and the parameters
 presented are the most likely to compile correctly. In each of the packages,
-one other option to <filename>configure</filename> can be added: 
-<command>--enable-final</command>. This option can speed up the build 
+one other option to <command>configure</command> can be added: 
+<parameter>--enable-final</parameter>. This option can speed up the build 
 process, but requires a lot of memory. If you have less than 256MB of RAM, 
 this option may cause swapping and significantly slow compilation.</para>
@@ -29,10 +29,10 @@
 The default is to
 install most of the components. If specific components are to be eliminated, the
-official way is to set the variable <userinput>DO_NOT_COMPILE</userinput>.
+official way is to set the variable <envar>DO_NOT_COMPILE</envar>.
 This comes in handy when there are problems compiling a particular
 component.</para>
 
 <screen><userinput><command>DO_NOT_COMPILE="component1 component2" \
-./configure --prefix=/opt/kde...</command></userinput></screen>
+    ./configure --prefix=/opt/kde...</command></userinput></screen>
 
 <para>The core <acronym>KDE</acronym> packages also honor this variable, but omitting components
Index: kde/kde.ent
===================================================================
--- kde/kde.ent	(revision 1a55aceb12f58726d36c9ba79d33640fd57fe5cb)
+++ kde/kde.ent	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
@@ -2,6 +2,7 @@
 <!ENTITY kde-intro SYSTEM "kde-intro.xml">
 
-<!ENTITY kde-version "3.1.4">
-<!ENTITY kde-download "ftp://ftp.kde.org/pub/kde/stable/&kde-version;/src">
+<!ENTITY kde-version "3.1.5">
+<!ENTITY kde-download-http "http://mirrors.isc.org/pub/kde/stable/&kde-version;/src">
+<!ENTITY kde-download-ftp "ftp://ftp.kde.org/pub/kde/stable/&kde-version;/src">
 <!ENTITY kde-dir "/opt/kde-&kde-version;">
 
@@ -11,10 +12,10 @@
 
 <!ENTITY kde-core-arts SYSTEM "core/arts.xml">
-<!ENTITY arts-buildsize "42.5 MB">
-<!ENTITY arts-version "1.1.4">
-<!ENTITY arts-download-http "">
-<!ENTITY arts-download-ftp "&kde-download;/arts-&arts-version;.tar.bz2">
-<!ENTITY arts-size "963 KB">
-<!ENTITY arts-time "2.52 SBU">
+<!ENTITY arts-version "1.1.5">
+<!ENTITY arts-download-http "&kde-download-http;/arts-&arts-version;.tar.bz2">
+<!ENTITY arts-download-ftp "&kde-download-ftp;/arts-&arts-version;.tar.bz2">
+<!ENTITY arts-size "967 KB">
+<!ENTITY arts-buildsize "24 MB">
+<!ENTITY arts-time "1.63 SBU">
 
 <!-- KDE Additional -->
@@ -33,93 +34,93 @@
 
 <!ENTITY kde-libs SYSTEM "inst/kde-libs.xml">
-<!ENTITY kde-libs-buildsize "193 MB">
-<!ENTITY kde-libs-download-http "">
-<!ENTITY kde-libs-download-ftp "&kde-download;/kdelibs-&kde-version;.tar.bz2">
-<!ENTITY kde-libs-size "10 MB">
-<!ENTITY kde-libs-time "35.34 SBU">
+<!ENTITY kde-libs-download-http "&kde-download-http;/kdelibs-&kde-version;.tar.bz2">
+<!ENTITY kde-libs-download-ftp "&kde-download-ftp;/kdelibs-&kde-version;.tar.bz2">
+<!ENTITY kde-libs-size "11 MB">
+<!ENTITY kde-libs-buildsize "133 MB">
+<!ENTITY kde-libs-time "11.03 SBU">
 
 <!ENTITY kde-base SYSTEM "inst/kde-base.xml">
+<!ENTITY kde-base-download-http "&kde-download-http;/kdebase-&kde-version;.tar.bz2">
+<!ENTITY kde-base-download-ftp "&kde-download-ftp;/kdebase-&kde-version;.tar.bz2">
+<!ENTITY kde-base-size "15 MB">
 <!ENTITY kde-base-buildsize "196 MB">
-<!ENTITY kde-base-download-http "">
-<!ENTITY kde-base-download-ftp "&kde-download;/kdebase-&kde-version;.tar.bz2">
-<!ENTITY kde-base-size "14 MB">
-<!ENTITY kde-base-time "28.22 SBU">
+<!ENTITY kde-base-time "18.43 SBU">
 
 <!ENTITY kde-multimedia SYSTEM "inst/kde-multimedia.xml">
-<!ENTITY kde-multimedia-buildsize "88 MB">
-<!ENTITY kde-multimedia-download-http "">
-<!ENTITY kde-multimedia-download-ftp "&kde-download;/kdemultimedia-&kde-version;.tar.bz2">
+<!ENTITY kde-multimedia-download-http "&kde-download-http;/kdemultimedia-&kde-version;.tar.bz2">
+<!ENTITY kde-multimedia-download-ftp "&kde-download-ftp;/kdemultimedia-&kde-version;.tar.bz2">
 <!ENTITY kde-multimedia-size "5.7 MB">
-<!ENTITY kde-multimedia-time "11.47 SBU">
+<!ENTITY kde-multimedia-buildsize "72 MB">
+<!ENTITY kde-multimedia-time "9.57 SBU">
 
 <!ENTITY kde-network SYSTEM "inst/kde-network.xml">
-<!ENTITY kde-network-buildsize "86 MB">
-<!ENTITY kde-network-download-http "">
-<!ENTITY kde-network-download-ftp "&kde-download;/kdenetwork-&kde-version;.tar.bz2">
+<!ENTITY kde-network-download-http "&kde-download-http;/kdenetwork-&kde-version;.tar.bz2">
+<!ENTITY kde-network-download-ftp "&kde-download-ftp;/kdenetwork-&kde-version;.tar.bz2">
 <!ENTITY kde-network-size "4.8 MB">
-<!ENTITY kde-network-time "8.20 SBU">
+<!ENTITY kde-network-buildsize "67 MB">
+<!ENTITY kde-network-time "6.14 SBU">
 
 <!ENTITY kde-graphics SYSTEM "inst/kde-graphics.xml">
-<!ENTITY kde-graphics-buildsize "49 MB">
-<!ENTITY kde-graphics-download-http "">
-<!ENTITY kde-graphics-download-ftp "&kde-download;/kdegraphics-&kde-version;.tar.bz2">
+<!ENTITY kde-graphics-download-http "&kde-download-http;/kdegraphics-&kde-version;.tar.bz2">
+<!ENTITY kde-graphics-download-ftp "&kde-download-ftp;/kdegraphics-&kde-version;.tar.bz2">
 <!ENTITY kde-graphics-size "4.4 MB">
-<!ENTITY kde-graphics-time "9.23 SBU">
+<!ENTITY kde-graphics-buildsize "47 MB">
+<!ENTITY kde-graphics-time "6.71 SBU">
 
 <!ENTITY kde-pim SYSTEM "inst/kde-pim.xml">
-<!ENTITY kde-pim-buildsize "55 MB">
-<!ENTITY kde-pim-download-http "">
-<!ENTITY kde-pim-download-ftp "&kde-download;/kdepim-&kde-version;.tar.bz2">
-<!ENTITY kde-pim-size "3.1 MB">
-<!ENTITY kde-pim-time "7.03 SBU">
+<!ENTITY kde-pim-download-http "&kde-download-http;/kdepim-&kde-version;.tar.bz2">
+<!ENTITY kde-pim-download-ftp "&kde-download-ftp;/kdepim-&kde-version;.tar.bz2">
+<!ENTITY kde-pim-size "3.2 MB">
+<!ENTITY kde-pim-buildsize "62 MB">
+<!ENTITY kde-pim-time "4.71 SBU">
 
 <!ENTITY kde-admin SYSTEM "inst/kde-admin.xml">
-<!ENTITY kde-admin-buildsize "44 MB">
-<!ENTITY kde-admin-download-http "">
-<!ENTITY kde-admin-download-ftp "&kde-download;/kdeadmin-&kde-version;.tar.bz2">
+<!ENTITY kde-admin-download-http "&kde-download-http;/kdeadmin-&kde-version;.tar.bz2">
+<!ENTITY kde-admin-download-ftp "&kde-download-ftp;/kdeadmin-&kde-version;.tar.bz2">
 <!ENTITY kde-admin-size "1.5 MB">
-<!ENTITY kde-admin-time "2.53 SBU">
+<!ENTITY kde-admin-buildsize "19 MB">
+<!ENTITY kde-admin-time "1.47 SBU">
 
 <!ENTITY kde-games SYSTEM "inst/kde-games.xml">
-<!ENTITY kde-games-buildsize "92 MB">
-<!ENTITY kde-games-download-http "">
-<!ENTITY kde-games-download-ftp "&kde-download;/kdegames-&kde-version;.tar.bz2">
-<!ENTITY kde-games-size "8.1 MB">
-<!ENTITY kde-games-time "7.86 SBU">
+<!ENTITY kde-games-download-http "&kde-download-http;/kdegames-&kde-version;.tar.bz2">
+<!ENTITY kde-games-download-ftp "&kde-download-ftp;/kdegames-&kde-version;.tar.bz2">
+<!ENTITY kde-games-size "8.2 MB">
+<!ENTITY kde-games-buildsize "67 MB">
+<!ENTITY kde-games-time "4.73 SBU">
 
 <!ENTITY kde-utils SYSTEM "inst/kde-utils.xml">
-<!ENTITY kde-utils-buildsize "31 MB">
-<!ENTITY kde-utils-download-http "">
-<!ENTITY kde-utils-download-ftp "&kde-download;/kdeutils-&kde-version;.tar.bz2">
-<!ENTITY kde-utils-size "1.3 MB">
-<!ENTITY kde-utils-time "3.76 SBU">
+<!ENTITY kde-utils-download-http "&kde-download-http;/kdeutils-&kde-version;.tar.bz2">
+<!ENTITY kde-utils-download-ftp "&kde-download-ftp;/kdeutils-&kde-version;.tar.bz2">
+<!ENTITY kde-utils-size "1.4 MB">
+<!ENTITY kde-utils-buildsize "25 MB">
+<!ENTITY kde-utils-time "2.54 SBU">
 
 <!ENTITY kde-edu SYSTEM "inst/kde-edu.xml">
-<!ENTITY kde-edu-buildsize "105 MB">
-<!ENTITY kde-edu-download-http "">
-<!ENTITY kde-edu-download-ftp "&kde-download;/kdeedu-&kde-version;.tar.bz2">
-<!ENTITY kde-edu-size "19 MB">
-<!ENTITY kde-edu-time "4.65 SBU">
+<!ENTITY kde-edu-download-http "&kde-download-http;/kdeedu-&kde-version;.tar.bz2">
+<!ENTITY kde-edu-download-ftp "&kde-download-ftp;/kdeedu-&kde-version;.tar.bz2">
+<!ENTITY kde-edu-size "20 MB">
+<!ENTITY kde-edu-buildsize "75 MB">
+<!ENTITY kde-edu-time "3.50 SBU">
 
 <!ENTITY kde-artwork SYSTEM "inst/kde-artwork.xml">
-<!ENTITY kde-artwork-buildsize "61 MB">
-<!ENTITY kde-artwork-download-http "">
-<!ENTITY kde-artwork-download-ftp "&kde-download;/kdeartwork-&kde-version;.tar.bz2">
-<!ENTITY kde-artwork-size "13 MB">
-<!ENTITY kde-artwork-time "1.13 SBU">
+<!ENTITY kde-artwork-download-http "&kde-download-http;/kdeartwork-&kde-version;.tar.bz2">
+<!ENTITY kde-artwork-download-ftp "&kde-download-ftp;/kdeartwork-&kde-version;.tar.bz2">
+<!ENTITY kde-artwork-size "14 MB">
+<!ENTITY kde-artwork-buildsize "48 MB">
+<!ENTITY kde-artwork-time "1.80 SBU">
 
 <!ENTITY kde-toys SYSTEM "inst/kde-toys.xml">
-<!ENTITY kde-toys-buildsize "18 MB">
-<!ENTITY kde-toys-download-http "">
-<!ENTITY kde-toys-download-ftp "&kde-download;/kdetoys-&kde-version;.tar.bz2">
+<!ENTITY kde-toys-download-http "&kde-download-http;/kdetoys-&kde-version;.tar.bz2">
+<!ENTITY kde-toys-download-ftp "&kde-download-ftp;/kdetoys-&kde-version;.tar.bz2">
 <!ENTITY kde-toys-size "1.8 MB">
-<!ENTITY kde-toys-time "1.51 SBU">
+<!ENTITY kde-toys-buildsize "13 MB">
+<!ENTITY kde-toys-time "0.96 SBU">
 
 <!ENTITY kde-addons SYSTEM "inst/kde-addons.xml">
-<!ENTITY kde-addons-buildsize "26 MB">
-<!ENTITY kde-addons-download-http "">
-<!ENTITY kde-addons-download-ftp "&kde-download;/kdeaddons-&kde-version;.tar.bz2">
-<!ENTITY kde-addons-size "1.0 MB">
-<!ENTITY kde-addons-time "4.85 SBU">
+<!ENTITY kde-addons-download-http "&kde-download-http;/kdeaddons-&kde-version;.tar.bz2">
+<!ENTITY kde-addons-download-ftp "&kde-download-ftp;/kdeaddons-&kde-version;.tar.bz2">
+<!ENTITY kde-addons-size "1.1 MB">
+<!ENTITY kde-addons-buildsize "23 MB">
+<!ENTITY kde-addons-time "4.28 SBU">
 
 <!--
