Index: gnome/add/libgda.xml
===================================================================
--- gnome/add/libgda.xml	(revision a027d7d3a9c10b6788f86fb576e879bc1c39aaab)
+++ gnome/add/libgda.xml	(revision a0c3cfb7ef42bfaee5687b0624613e129ca02cf1)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libgda-download-http "&gnome-download-http;/libgda/4.2/libgda-&libgda-version;.tar.bz2">
-  <!ENTITY libgda-download-ftp  "&gnome-download-ftp;/libgda/4.2/libgda-&libgda-version;.tar.bz2">
-  <!ENTITY libgda-md5sum        "dbff943b8c7c14fc22e0cb85cc8216e6">
-  <!ENTITY libgda-size          "15 MB">
-  <!ENTITY libgda-buildsize     "296 MB">
-  <!ENTITY libgda-time          "4.3 SBU">
+  <!ENTITY libgda-download-http "&gnome-download-http;/libgda/5.0/libgda-&libgda-version;.tar.xz">
+  <!ENTITY libgda-download-ftp  "&gnome-download-ftp;/libgda/5.0/libgda-&libgda-version;.tar.xz">
+  <!ENTITY libgda-md5sum        "58efdf8f727b5a0b1e5fb35d19ee76a7">
+  <!ENTITY libgda-size          "12 MB">
+  <!ENTITY libgda-buildsize     "196 MB">
+  <!ENTITY libgda-time          "3.8 SBU">
 ]>
 
@@ -33,5 +33,5 @@
     library for the <application>GNOME</application> project.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -60,18 +60,33 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libxml2"/> and
-    <xref linkend="pkgconfig"/></para>
+    <para role="required">
+      <xref linkend="intltool"/>,
+      <xref linkend="libxml2"/> and
+      <xref linkend="pkgconfig"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="iso-codes"/>,
+      <xref linkend="libgnome-keyring"/>,
+      <xref linkend="libsoup"/>,
+      <xref linkend="libxslt"/> and
+      <xref linkend="sqlite"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="db"/>,
-    <ulink url="http://www.firebirdsql.org/">firebird</ulink>,
-    <xref linkend="gtksourceview"/>,
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
-    <xref linkend="libgnome-keyring"/>,
-    <xref linkend="libsoup"/>,
-    <xref linkend="libunique"/>,
-    <xref linkend="mysql"/>,
-    <xref linkend="postgresql"/>, and
-    <xref linkend="sqlite"/></para>
+    <para role="optional">
+      <xref linkend="db"/>,
+      <ulink url="http://www.firebirdsql.org/">firebird</ulink>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="gtksourceview"/>,
+      <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+      <xref linkend="mysql"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="postgresql"/> and
+      <xref linkend="vala"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -86,6 +101,6 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR &amp;&amp; \
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
             --enable-system-sqlite &amp;&amp;
 make</userinput></screen>
@@ -102,13 +117,9 @@
 
   <sect2 role="commands">
+
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter
-    ensures that the config file and test database are located consistently with
-    the rest of a <application>GNOME</application> desktop, particularly where
-    GNOME_PREFIX is <filename class="directory">/usr</filename>.</para>
-
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
     <para><option>--enable-system-sqlite</option> : use the system version of
@@ -128,7 +139,19 @@
 
       <seglistitem>
-        <seg>color.py, gda-browser-4.0, gda-control-center-4.0, gda-list-config (symlink to) gda-list-config-4.0, gda-list-server-op (symlink to) gda-list-server-op-4.0, gda-sql (symlink to) gda-sql-4.0, gda-test-connection-4.0, gdaui-demo-4.0, trml2html.py, and trml2pdf.py</seg>
-        <seg>libgda-4.0.{so,a}, libgda-bdb.{so,a}, libgda-report-4.0.{so,a}, libgda-sqlcipher.{so,a}, libgda-sqlite.{so,a}, libgda-ui-4.0.{so,a}, libgda-ui-plugins.{so,a}, libgda-web.{so,a}, and libgda-xslt-4.0.{so,a}</seg>
-        <seg><envar>$GNOME_SYSCONFDIR</envar>/libgda-4.0, <envar>$GNOME_SYSCONFDIR</envar>/{bin/{gda_trml2html,gda_trml2pdf},include/libgda-4.0/{libgda-report,libgda-ui,libgda-xslt,libgda/{handlers,providers-support,sql-parser,sqlite,thread-wrapper,virtual}},lib/libgda-4.0/{plugins,providers},share/{gnome/help/gda-browser/{C/figures,de/figures,es/figures,sl/figures},gtk-doc/html/{gda-browser,libgda-4.0},libgda-4.0/{demo,dtd,icons/hicolor/{16x16/actions,22x22/actions,24x24/actions,32x32/actions,scalable/actions},language-specs,php,pixmaps,ui,web},locale/sr@Latn/LC_MESSAGES}}</seg>
+        <seg>
+          gda-browser-5.0, gda-control-center-5.0, gda-list-config-5.0,
+          gda-list-jdbc-providers-5.0, gda-list-server-op-5.0,
+          gda-sql-5.0, gda-test-connection-5.0 and gdaui-demo-5.0
+        </seg>
+        <seg>
+          libgda-5.0.so, libgda-report-5.0.so, libgda-ui-5.0.so and
+          libgda-xslt-5.0.so
+        </seg>
+        <seg>
+          /etc/libgda-5.0, /usr/include/libgda-5.0,
+          /usr/lib/libgda-5.0, /usr/share/gnome/help/{gda-browser,gda-sql},
+          /usr/share/gtk-doc/html/{gda-browser,libgda-5.0} and
+          /usr/share/libgda-5.0
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -139,196 +162,96 @@
       <?dbhtml list-presentation="table"?>
 
-      <!--<varlistentry id="color.py">
-        <term><command>color.py</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="libgda color.py">
-            <primary sortas="b-color.py">color.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="gda-browser-4.0">
-        <term><command>gda-browser-4.0</command></term>
+      <varlistentry id="gda-browser-5.0">
+        <term><command>gda-browser-5.0</command></term>
         <listitem>
           <para>is a graphical tool to provide a quick access to a database&apos;s
           structure and contents.</para>
-          <indexterm zone="libgda gda-browser-4.0">
-            <primary sortas="b-gda-browser-4.0">gda-browser-4.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-control-center-4.0">
-        <term><command>gda-control-center-4.0</command></term>
+          <indexterm zone="libgda gda-browser-5.0">
+            <primary sortas="b-gda-browser-5.0">gda-browser-5.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gda-control-center-5.0">
+        <term><command>gda-control-center-5.0</command></term>
         <listitem>
           <para>is a configuration tool for libgda.</para>
-          <indexterm zone="libgda gda-control-center-4.0">
-            <primary sortas="b-gda-control-center-4.0">gda-control-center-4.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-list-config-4.0">
-        <term><command>gda-list-config-4.0</command></term>
+          <indexterm zone="libgda gda-control-center-5.0">
+            <primary sortas="b-gda-control-center-5.0">gda-control-center-5.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gda-list-config-5.0">
+        <term><command>gda-list-config-5.0</command></term>
         <listitem>
           <para>lists all the declared data sources and all the installed
           providers.</para>
-          <indexterm zone="libgda gda-list-config-4.0">
-            <primary sortas="b-gda-list-config-4.0">gda-list-config-4.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-list-server-op-4.0">
-        <term><command>gda-list-server-op-4.0</command></term>
+          <indexterm zone="libgda gda-list-config-5.0">
+            <primary sortas="b-gda-list-config-5.0">gda-list-config-5.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gda-list-server-op-5.0">
+        <term><command>gda-list-server-op-5.0</command></term>
         <listitem>
           <para>lists available DDL operations for one or all of the installed
           providers.</para>
-          <indexterm zone="libgda gda-list-server-op-4.0">
-            <primary sortas="b-gda-list-server-op-4.0">gda-list-server-op-4.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-sql-4.0">
-        <term><command>gda-sql-4.0</command></term>
+          <indexterm zone="libgda gda-list-server-op-5.0">
+            <primary sortas="b-gda-list-server-op-5.0">gda-list-server-op-5.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gda-sql-5.0">
+        <term><command>gda-sql-5.0</command></term>
         <listitem>
           <para>is an interactive commandline tool to run SQL commands.</para>
-          <indexterm zone="libgda gda-sql-4.0">
-            <primary sortas="b-gda-sql-4.0">gda-sql-4.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-test-connection-4.0">
-        <term><command>gda-test-connection-4.0</command></term>
+          <indexterm zone="libgda gda-sql-5.0">
+            <primary sortas="b-gda-sql-5.0">gda-sql-5.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gda-test-connection-5.0">
+        <term><command>gda-test-connection-5.0</command></term>
         <listitem>
           <para>is a &apos;ping&apos; like tool to test connectivity to databases.</para>
-          <indexterm zone="libgda gda-test-connection-4.0">
-            <primary sortas="b-gda-test-connection-4.0">gda-test-connection-4.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--<varlistentry id="gdaui-demo-4.0">
-        <term><command>gdaui-demo-4.0</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="libgda gdaui-demo-4.0">
-            <primary sortas="b-gdaui-demo-4.0">gdaui-demo-4.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <!--<varlistentry id="trml2html.py">
-        <term><command>trml2html.py</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="libgda trml2html.py">
-            <primary sortas="b-trml2html.py">trml2html.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="trml2pdf.py">
-        <term><command>trml2pdf.py</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="libgda trml2pdf.py">
-            <primary sortas="b-trml2pdf.py">trml2pdf.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <!--<varlistentry id="libgda-4">
-        <term><filename class='libraryfile'>libgda-4.0.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="libgda libgda-4">
-            <primary sortas="c-libgda-4">libgda-4.0.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-bdb">
-        <term><filename class='libraryfile'>libgda-bdb.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="libgda libgda-bdb">
-            <primary sortas="c-libgda-bdb">libgda-bdb.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-report-4">
-        <term><filename class='libraryfile'>libgda-report-4.0.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="libgda libgda-report-4">
-            <primary sortas="c-libgda-report-4">libgda-report-4.0.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-sqlcipher">
-        <term><filename class='libraryfile'>libgda-sqlcipher.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="libgda libgda-sqlcipher">
-            <primary sortas="c-libgda-sqlcipher">libgda-sqlcipher.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-sqlite">
-        <term><filename class='libraryfile'>libgda-sqlite.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="libgda libgda-sqlite">
-            <primary sortas="c-libgda-sqlite">libgda-sqlite.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-ui-4">
-        <term><filename class='libraryfile'>libgda-ui-4.0.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="libgda libgda-ui-4">
-            <primary sortas="c-libgda-ui-4">libgda-ui-4.0.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-ui-plugins">
-        <term><filename class='libraryfile'>libgda-ui-plugins.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="libgda libgda-ui-plugins">
-            <primary sortas="c-libgda-ui-plugins">libgda-ui-plugins.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-web">
-        <term><filename class='libraryfile'>libgda-web.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="libgda libgda-web">
-            <primary sortas="c-libgda-web">libgda-web.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-xslt-4">
-        <term><filename class='libraryfile'>libgda-xslt-4.0.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="libgda libgda-xslt-4">
-            <primary sortas="c-libgda-xslt-4">libgda-xslt-4.0.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
+          <indexterm zone="libgda gda-test-connection-5.0">
+            <primary sortas="b-gda-test-connection-5.0">gda-test-connection-5.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgda-5">
+        <term><filename class='libraryfile'>libgda-5.0.so</filename></term>
+        <listitem>
+          <para>is the Gnome Data Access library.</para>
+          <indexterm zone="libgda libgda-5">
+            <primary sortas="c-libgda-5">libgda-5.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgda-ui-5">
+        <term><filename class='libraryfile'>libgda-ui-5.0.so</filename></term>
+        <listitem>
+          <para>is the GDA UI extension.</para>
+          <indexterm zone="libgda libgda-ui-5">
+            <primary sortas="c-libgda-ui-5">libgda-ui-5.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgda-xslt-5">
+        <term><filename class='libraryfile'>libgda-xslt-5.0.so</filename></term>
+        <listitem>
+          <para>is the GDA XSLT extension.</para>
+          <indexterm zone="libgda libgda-xslt-5">
+            <primary sortas="c-libgda-xslt-5">libgda-xslt-5.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
     </variablelist>
