Index: general.ent
===================================================================
--- general.ent	(revision 473a13dbe0188925faaaa423ccbd69082fada41c)
+++ general.ent	(revision 9b7d4969550f3cd0787d8279d7a4e937f000e6bf)
@@ -338,7 +338,7 @@
 <!ENTITY unrar-version                "4.1.1">
 <!ENTITY libarchive-version           "2.8.5">
-<!ENTITY raptor-version               "1.4.21">
-<!ENTITY rasqal-version               "0.9.20">
-<!ENTITY redland-version              "1.0.12">
+<!ENTITY raptor-version               "2.0.7">
+<!ENTITY rasqal-version               "0.9.28">
+<!ENTITY redland-version              "1.0.15">
 <!ENTITY strigi-version               "0.7.5">
 <!-- <!ENTITY packagekit-version           "0.7.1"> -->
Index: general/sysutils/raptor.xml
===================================================================
--- general/sysutils/raptor.xml	(revision 473a13dbe0188925faaaa423ccbd69082fada41c)
+++ general/sysutils/raptor.xml	(revision 9b7d4969550f3cd0787d8279d7a4e937f000e6bf)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY raptor-download-http "http://download.librdf.org/source/raptor-&raptor-version;.tar.gz">
+  <!ENTITY raptor-download-http "http://download.librdf.org/source/raptor2-&raptor-version;.tar.gz">
   <!ENTITY raptor-download-ftp  " ">
-  <!ENTITY raptor-md5sum        "992061488af7a9e2d933df6b694bb876">
+  <!ENTITY raptor-md5sum        "699073463467dc8eded2ca89de2ab2ea">
   <!ENTITY raptor-size          "1.6 MB">
-  <!ENTITY raptor-buildsize     "24 MB">
-  <!ENTITY raptor-time          "0.5 SBU">
+  <!ENTITY raptor-buildsize     "13.1 MB">
+  <!ENTITY raptor-time          "0.2 SBU">
 ]>
 
@@ -58,5 +58,5 @@
     </itemizedlist>
 
-
+ <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -66,5 +66,5 @@
       </listitem>
     </itemizedlist>
-
+    -->
     <bridgehead renderas="sect3">Raptor Dependencies</bridgehead>
 
@@ -86,11 +86,12 @@
 
   <sect2 role="installation">
-    <title>Installation of raptor</title>
+    <title>Installation of Raptor</title>
 
-    <para>Install <application>raptor</application> by running the following
+    <para>Install <application>Raptor</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np0 -i ../raptor-&raptor-version;-curl.patch &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
+ <!-- patch -Np0 -i ../raptor-&raptor-version;-curl.patch &amp;&amp; -->
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -103,7 +104,8 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
+<!--
     <para><option>patch -Np1 -i ../raptor-&raptor-version;-curl.patch</option>: This 
       patch fixes compiling with <application>cURL</application>.</para>
+-->      
     <para><option>--disable-static</option>: This option prevents compiling the 
     static archive versions of the libraries.</para>
@@ -116,10 +118,10 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>rapper, raptor-config</seg>
-        <seg>libraptor.so</seg>
-        <seg>None</seg>
+        <seg>rapper</seg>
+        <seg>libraptor2.so</seg>
+	<seg>/usr/include/raptor2 and /usr/share/gtk-doc/html/raptor2</seg>
       </seglistitem>
     </segmentedlist>
@@ -140,14 +142,4 @@
       </varlistentry>
 
-      <varlistentry id="raptor-config">
-        <term><command>raptor-config</command></term>
-        <listitem>
-          <para>is a utility for retrieving the installation options of raptor</para>
-          <indexterm zone="raptor raptor-config">
-            <primary sortas="b-raptor-config">raptor-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
Index: general/sysutils/rasqal.xml
===================================================================
--- general/sysutils/rasqal.xml	(revision 473a13dbe0188925faaaa423ccbd69082fada41c)
+++ general/sysutils/rasqal.xml	(revision 9b7d4969550f3cd0787d8279d7a4e937f000e6bf)
@@ -7,8 +7,8 @@
   <!ENTITY rasqal-download-http "http://download.librdf.org/source/rasqal-&rasqal-version;.tar.gz">
   <!ENTITY rasqal-download-ftp  " ">
-  <!ENTITY rasqal-md5sum        "c45b6cd784298e264e8757d14355ecce">
-  <!ENTITY rasqal-size          "1.2 MB">
-  <!ENTITY rasqal-buildsize     "19 MB">
-  <!ENTITY rasqal-time          "0.5 SBU">
+  <!ENTITY rasqal-md5sum        "a3662b8d9efef9d8ef0a3c182450fba2">
+  <!ENTITY rasqal-size          "1.4 MB">
+  <!ENTITY rasqal-buildsize     "12.3 MB">
+  <!ENTITY rasqal-time          "0.2 SBU">
 ]>
 
@@ -36,5 +36,5 @@
     <application>Nepomuk</application>.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -68,7 +68,7 @@
       </listitem>
     </itemizedlist>
+-->
+    <bridgehead renderas="sect3">Rasqal Dependencies</bridgehead>
 
-    <bridgehead renderas="sect3">rasqal Dependencies</bridgehead>
--->
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
@@ -82,10 +82,10 @@
 
   <sect2 role="installation">
-    <title>Installation of rasqal</title>
+    <title>Installation of Rasqal</title>
 
-    <para>Install <application>rasqal</application> by running the following
+    <para>Install <application>Rasqal</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -95,12 +95,13 @@
 
   </sect2>
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
+    
+    <para><option>--disable-static</option>: This option prevents compiling the 
+    static archive versions of the libraries.</para>
+    
+  </sect2>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -109,10 +110,10 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>roqet, rasqal-config</seg>
-        <seg>librasqal.{a,so}</seg>
-        <seg>None</seg>
+        <seg>rasqal-config and roqet</seg>
+        <seg>librasqal.so</seg>
+	<seg>/usr/include/rasqal and /usr/share/gtk-doc/html/rasqal</seg>
       </seglistitem>
     </segmentedlist>
@@ -123,4 +124,14 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="rasqal-config">
+        <term><command>rasqal-config</command></term>
+        <listitem>
+          <para>is a utility for retrieving the installation options of rasqal</para>
+          <indexterm zone="rasqal rasqal-config">
+            <primary sortas="b-rasqal-config">rasqal-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
       <varlistentry id="roqet">
         <term><command>roqet</command></term>
@@ -133,14 +144,4 @@
       </varlistentry>
 
-      <varlistentry id="rasqal-config">
-        <term><command>rasqal-config</command></term>
-        <listitem>
-          <para>is a utility for retrieving the installation options of rasqal</para>
-          <indexterm zone="rasqal rasqal-config">
-            <primary sortas="b-rasqal-config">rasqal-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
Index: general/sysutils/redland.xml
===================================================================
--- general/sysutils/redland.xml	(revision 473a13dbe0188925faaaa423ccbd69082fada41c)
+++ general/sysutils/redland.xml	(revision 9b7d4969550f3cd0787d8279d7a4e937f000e6bf)
@@ -7,8 +7,8 @@
   <!ENTITY redland-download-http "http://download.librdf.org/source/redland-&redland-version;.tar.gz">
   <!ENTITY redland-download-ftp  " ">
-  <!ENTITY redland-md5sum        "40f37a5ad97fdfbf984f78dcea0c6115">
+  <!ENTITY redland-md5sum        "b0deb87f3c7d3237a3d587c1e0f2f266">
   <!ENTITY redland-size          "1.5 MB">
-  <!ENTITY redland-buildsize     "19 MB">
-  <!ENTITY redland-time          "0.9 SBU">
+  <!ENTITY redland-buildsize     "20.9 MB">
+  <!ENTITY redland-time          "0.2 SBU">
 ]>
 
@@ -35,5 +35,5 @@
     <application>Nepomuk</application>.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82,5 +82,6 @@
     <xref linkend="mysql"/>, 
     <xref linkend="postgresql"/>,
-    <xref linkend="virtuoso"/>
+    <xref linkend="virtuoso"/> and
+    <ulink url="http://sourceforge.net/projects/threestore/">3store</ulink>
     </para>
  
@@ -91,10 +92,10 @@
 
   <sect2 role="installation">
-    <title>Installation of redland</title>
+    <title>Installation of Redland</title>
 
-    <para>Install <application>redland</application> by running the following
+    <para>Install <application>Redland</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -104,12 +105,13 @@
 
   </sect2>
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
+    <para><option>--disable-static</option>: This option prevents compiling the 
+    static archive versions of the libraries.</para>
 
   </sect2>
--->
+
   <sect2 role="content">
     <title>Contents</title>
@@ -118,10 +120,11 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>redland-db-upgrade, rdfproc, redland-config</seg>
-	<seg>librdf.{a,so}, redland/librdf_storage_*.{so,a}</seg>
-        <seg>None</seg>
+        <seg>rdfproc, redland-config and redland-db-upgrade</seg>
+	<seg>librdf.so and /usr/lib/redland/librdf_storage_*.so</seg>
+	<seg>/usr/lib/redland, /usr/share/gtk-doc/html/redland and 
+	/usr/share/redland</seg>
       </seglistitem>
     </segmentedlist>
@@ -141,5 +144,26 @@
         </listitem>
       </varlistentry>
+      
+      <varlistentry id="redland-config">
+        <term><command>redland-config</command></term>
+        <listitem>
+          <para>is a script to get information about the installed version 
+	  of Redland.</para>
+          <indexterm zone="redland redland-config">
+            <primary sortas="b-redland-config">redland-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
+      <varlistentry id="redland-db-upgrade">
+        <term><command>redland-db-upgrade</command></term>
+        <listitem>
+          <para>upgrades older Redland databases to 0.9.12 format.</para>
+          <indexterm zone="redland redland-db-upgrade">
+            <primary sortas="b-redland-db-upgrade">redland-db-upgrade</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>      
+      
     </variablelist>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 473a13dbe0188925faaaa423ccbd69082fada41c)
+++ introduction/welcome/changelog.xml	(revision 9b7d4969550f3cd0787d8279d7a4e937f000e6bf)
@@ -47,4 +47,13 @@
       <itemizedlist>
         <listitem>
+          <para>[rthomsen] - Redland 1.0.15.</para>
+        </listitem>
+	<listitem>
+          <para>[rthomsen] - Rasqal 0.9.28.</para>
+        </listitem>
+        <listitem>
+          <para>[rthomsen] - Raptor 2.0.7.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Fix libexecdir in udev. Fixes ticket
           <ulink url="&blfs-ticket-root;3309">#3309</ulink>.</para>
Index: server/databases/mysql.xml
===================================================================
--- server/databases/mysql.xml	(revision 473a13dbe0188925faaaa423ccbd69082fada41c)
+++ server/databases/mysql.xml	(revision 9b7d4969550f3cd0787d8279d7a4e937f000e6bf)
@@ -312,5 +312,5 @@
         libmysqlclient.{so,a}, libmysqlclient_r.{so,a}, libmystrings.a,
         libmysys.a, and libvio.a</seg>
-        <seg>/srv/mysql, /usr/include/mysql, /usr/lib/mysql, /usr/share/mysql, and
+        <seg>/srv/mysql, /usr/include/mysql, /usr/lib/plugin, /usr/share/mysql and
         /var/run/mysql</seg>
       </seglistitem>
