Ticket #2486: kde_core-1.diff

kde/core/kdelibs.xml

@@ -59 +59 @@
     <bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="aRts"/></para>
+    <para role="required"><xref linkend="qt"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>,
+    <para role="recommended"><xref linkend="aRts"/>,
+    <xref linkend="libjpeg"/>,
     <xref linkend="libart_lgpl"/>,
     <xref linkend="libxml2"/>,
     <xref linkend="libxslt"/>,
@@ -75 +76 @@
     <para role="optional"><xref linkend="libtiff"/>,
     <xref linkend="aspell"/>,
     <xref linkend="cups"/>,
-    <!-- We should look real hard at the LDAP dependency. Though the KDE
-         dependency chart lists it for kdelibs, I don't think it uses it
-         one bit. -->
-    <xref linkend="openldap"/>,
     <xref linkend="alsa"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
@@ -89 +86 @@
     <ulink url="http://www.ivrix.org.il/projects/spell-checker/">Hspell</ulink>,
     <ulink url="ftp://oss.sgi.com/projects/xfs/cmd_tars/">libacl</ulink>
     (requires <ulink url="ftp://oss.sgi.com/projects/xfs/cmd_tars/">libattr</ulink>),
+    <xref linkend="sudo"/>,
     <xref linkend="graphviz"/>, and
     <xref linkend="doxygen"/></para>
 
@@ -97 +95 @@
 
   </sect2>
 
+  <sect2 id="kdelibs-runtime-dependencies" 
+         xreflabel="KDE Libraries Runtime Dependencies">
+    <title>Run-Time Dependencies</title>
+
+    <para>The <application>KDE</application> libraries access other programs at
+    run time. One additional package that has not been mentioned already is
+    <ulink url="http://packages.debian.org/unstable/source/pmount/">
+    pmount</ulink>.  This enables auto-mounting of hotplugged devices at
+    /media/[device_name] for any user without any fstab modification. It is
+    needed to enable the full integration of <application>KDE</application>
+    with <xref linkend="hal"/>.</para>
+
+  </sect2>
+
   <sect2 role="installation" id="kdelibs-install"
          xreflabel="the installation of kdelibs">
     <title>Installation of Kdelibs</title>
@@ -173 +185 @@
 
   </sect2>
 
-  <sect2 id="kdelibs-runtime-dependencies" 
-         xreflabel="KDE Libraries Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para>The <application>KDE</application> libraries access other programs at
-    run time. One additional package that has not been mentioned already is
-    <ulink url="http://packages.debian.org/unstable/source/pmount/">
-    pmount</ulink>.  This enables auto-mounting of hotplugged devices at
-    /media/[device_name] for any user without any fstab modification. It is
-    needed to enable the full integration of <application>KDE</application>
-    with <xref linkend="hal"/>.</para>
-
-  </sect2>
-
-
   <sect2 role="content">
     <title>Contents</title>
 

kde/core/kdebase.xml

@@ -83 +83 @@
     (requires <ulink url="http://sourceforge.net/projects/linux-diag">Sysfs
     Utilities</ulink>),
     <ulink url="http://www.opensource.apple.com/darwinsource/tarballs/apsl/">mDNSResponder</ulink>,
+    <xref linkend="sudo"/>,
     <xref linkend="graphviz"/>, and
     <xref linkend="doxygen"/></para>
 
@@ -91 +92 @@
 
   </sect2>
 
+  <sect2 id="kdebase-runtime-dependencies"
+         xreflabel="KDE Base Runtime Dependencies">
+    <title>Run-Time Dependencies</title>
+
+    <para>Note that there are two additional packages you can install that
+    are used at run-time for <command>konqueror</command> ioslave protocols.
+    You can install the <ulink
+    url="http://mtools.linux.lu/?power-to-the-parliament">Mtools</ulink>
+    package to enable the <quote>floppy</quote> ioslave protocol. This will
+    allow easy access to the floppy disk drives on your system. The <ulink
+    url="http://packages.debian.org/stable/source/hfsplus">hfsplus</ulink>
+    package can be installed to access HFS+ partitions on a Mac OS system
+    using the <quote>mac</quote> ioslave.</para>
+
+    <para>One additional package that can be used at run time is <xref
+    linkend="pciutils"/>.  This enables the <application>KDE Info
+    Center</application> to  use <application>lspci</application> for its "pci"
+    info section.</para>
+
+    <para>Another package usable at run time is <ulink
+    url="http://www.htdig.org">htdig</ulink>. The enables <command>
+    khelpcenter</command> to create a search index for the KDE application
+    manuals.</para>
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Kdebase</title>
 
@@ -148 +174 @@
 
   </sect2>
 
-  <sect2 id="kdebase-runtime-dependencies"
-         xreflabel="KDE Base Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para>Note that there are two additional packages you can install that
-    are used at run-time for <command>konqueror</command> ioslave protocols.
-    You can install the <ulink
-    url="http://mtools.linux.lu/?power-to-the-parliament">Mtools</ulink>
-    package to enable the <quote>floppy</quote> ioslave protocol. This will
-    allow easy access to the floppy disk drives on your system. The <ulink
-    url="http://packages.debian.org/stable/source/hfsplus">hfsplus</ulink>
-    package can be installed to access HFS+ partitions on a Mac OS system
-    using the <quote>mac</quote> ioslave.</para>
-
-    <para>One additional package that can be used at run time is <xref
-    linkend="pciutils"/>.  This enables the <application>KDE Info
-    Center</application> to  use <application>lspci</application> for its "pci"
-    info section.</para>
-
-  </sect2>
-
-
   <sect2 role="content">
     <title>Contents</title>