r8643 - in trunk/BOOK: . basicnet/netlibs basicnet/netprogs general/prog gnome/add introduction/welcome multimedia/audioutils postlfs/security server/databases server/mail server/major x/lib xsoft/graphweb xsoft/other

dj at linuxfromscratch.org dj at linuxfromscratch.org
Sun Oct 17 10:55:44 PDT 2010


Author: dj
Date: 2010-10-17 11:55:40 -0600 (Sun, 17 Oct 2010)
New Revision: 8643

Modified:
   trunk/BOOK/basicnet/netlibs/libsoup.xml
   trunk/BOOK/basicnet/netprogs/subversion.xml
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/php.xml
   trunk/BOOK/general/prog/python.xml
   trunk/BOOK/gnome/add/evolution-data-server.xml
   trunk/BOOK/gnome/add/hamster-applet.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/audioutils/amarok.xml
   trunk/BOOK/postlfs/security/cyrus-sasl.xml
   trunk/BOOK/postlfs/security/nss.xml
   trunk/BOOK/server/databases/db.xml
   trunk/BOOK/server/mail/exim.xml
   trunk/BOOK/server/major/apache.xml
   trunk/BOOK/server/major/samba3.xml
   trunk/BOOK/x/lib/qt.xml
   trunk/BOOK/x/lib/qt4.xml
   trunk/BOOK/x/lib/webkitgtk.xml
   trunk/BOOK/x/lib/xulrunner.xml
   trunk/BOOK/xsoft/graphweb/firefox.xml
   trunk/BOOK/xsoft/other/balsa.xml
   trunk/BOOK/xsoft/other/pidgin.xml
Log:
Revert last commit...wrong update.

Modified: trunk/BOOK/basicnet/netlibs/libsoup.xml
===================================================================
--- trunk/BOOK/basicnet/netlibs/libsoup.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/basicnet/netlibs/libsoup.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -67,10 +67,7 @@
     <para role="recommended"><xref linkend="gnutls"/>,
     <xref linkend="libgnome-keyring"/>,
     <xref linkend="libproxy"/>, and
-    <xref linkend="sqlite"/>  or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility)
-    (The latter three are required if building
-    <application>GNOME</application>)</para>
+    <xref linkend="sqlite"/> (The latter three are required if building <application>GNOME</application>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="GConf"/>,

Modified: trunk/BOOK/basicnet/netprogs/subversion.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/subversion.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/basicnet/netprogs/subversion.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -80,8 +80,7 @@
     <bridgehead renderas="sect3">Subversion Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility), and
+    <para role="required"><xref linkend="sqlite"/>, and
     <xref linkend="apache"/> (for the
     <application>APR</application> only) or
     <ulink url="http://apr.apache.org/">Apache Portable Runtime</ulink></para>

Modified: trunk/BOOK/general/prog/php.xml
===================================================================
--- trunk/BOOK/general/prog/php.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/general/prog/php.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -121,8 +121,7 @@
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
     <xref linkend="unixodbc"/>,
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility),
+    <xref linkend="sqlite"/>,
     <ulink url="http://qdbm.sourceforge.net/">QDBM</ulink>,
     <ulink url="http://cr.yp.to/cdb.html">cdb</ulink>,
     <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,

Modified: trunk/BOOK/general/prog/python.xml
===================================================================
--- trunk/BOOK/general/prog/python.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/general/prog/python.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -108,8 +108,7 @@
     <xref linkend="tk"/>,
     <xref linkend="db"/>, and
     <!-- <xref linkend="gdbm"/>, and -->
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility)</para>
+    <xref linkend="sqlite"/></para>
 
     <para>Note that there is a circular dependency with the
     <application>Tk</application> package as it requires Xorg to be installed

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/general.ent	2010-10-17 17:55:40 UTC (rev 8643)
@@ -490,7 +490,7 @@
 
 <!-- Chapter 23 -->
 
-<!ENTITY db-version                   "5.1.19">
+<!ENTITY db-version                   "4.8.26">
 <!ENTITY mysql-version                "5.1.49">
 <!ENTITY postgresql-version           "8.3.10">
 <!ENTITY sqlite-version               "3.6.23">

Modified: trunk/BOOK/gnome/add/evolution-data-server.xml
===================================================================
--- trunk/BOOK/gnome/add/evolution-data-server.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/gnome/add/evolution-data-server.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -70,8 +70,7 @@
     <xref linkend="libical"/>,
     <xref linkend="libsoup"/>,
     <xref linkend="nss"/>, and
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility)</para>
+    <xref linkend="sqlite"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="libgnome-keyring"/>,

Modified: trunk/BOOK/gnome/add/hamster-applet.xml
===================================================================
--- trunk/BOOK/gnome/add/hamster-applet.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/gnome/add/hamster-applet.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -61,8 +61,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="python"/> with <xref linkend="sqlite"/>
-    or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility),
     and <xref linkend="gnome-python-desktop"/> (gnomeapplet module only)</para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -68,9 +68,6 @@
         <listitem>
           <para>[dj] - Updated to Xorg 7.5-3 release packages.</para>
         </listitem>
-        <listitem>
-          <para>[dj] - Updated to Berkely DB 5.1.19.</para>
-        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/multimedia/audioutils/amarok.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/amarok.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/multimedia/audioutils/amarok.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -72,8 +72,7 @@
     <para role="optional"><xref linkend="kdemultimedia"/> (for cd-ripping support),
     <xref linkend="k3b"/> (for cd-burning support),
     <xref linkend="sdl"/>,
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility),
+    <xref linkend="sqlite"/>,
     <xref linkend="postgresql"/>,
     <xref linkend="mysql"/>,
     <ulink url="https://helixcommunity.org/">Helix</ulink> (untested media backend, alternative to xine),

Modified: trunk/BOOK/postlfs/security/cyrus-sasl.xml
===================================================================
--- trunk/BOOK/postlfs/security/cyrus-sasl.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/postlfs/security/cyrus-sasl.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -72,8 +72,7 @@
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
     <xref linkend="db"/>,
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility),
+    <xref linkend="sqlite"/>,
     <!-- <xref linkend="gdbm"/>,
     <xref linkend="courier"/>,  -->
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, and

Modified: trunk/BOOK/postlfs/security/nss.xml
===================================================================
--- trunk/BOOK/postlfs/security/nss.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/postlfs/security/nss.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -73,8 +73,7 @@
     <para role="required"><xref linkend="nspr"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility) (internal sqlite is
+    <para role="recommended"><xref linkend="sqlite"/> (internal sqlite is
     incompatable with existing or future installations)</para>
 
 

Modified: trunk/BOOK/server/databases/db.xml
===================================================================
--- trunk/BOOK/server/databases/db.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/server/databases/db.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!ENTITY db-download-http "http://download-east.oracle.com/berkeley-db/db-&db-version;.tar.gz">
-  <!ENTITY db-download-ftp  " ">
-  <!ENTITY db-md5sum        "76fcbfeebfcd09ba0b4d96bfdf8d884d">
-  <!ENTITY db-size          "30 MB">
-  <!ENTITY db-buildsize     "267 MB (additional 170 MB to run parallel standard test suite with all bindings)">
-  <!ENTITY db-time          "2.1 SBU (builds all bindings, add an additional 160 SBU to run parallel standard test suite)">
+  <!ENTITY db-download-ftp  "&gentoo-ftp-repo;/db-&db-version;.tar.gz">
+  <!ENTITY db-md5sum        "3476bac9ec0f3c40729c8a404151d5e3">
+  <!ENTITY db-size          "22.8 MB">
+  <!ENTITY db-buildsize     "250 MB (additional 100 MB to run parallel standard test suite)">
+  <!ENTITY db-time          "1.9 SBU (builds all bindings, add an additional 145 SBU to run parallel standard test suite)">
 ]>
 
 <sect1 id="db" xreflabel="Berkeley DB-&db-version;">
@@ -78,8 +78,10 @@
     <bridgehead renderas="sect3">Berkeley DB Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="tcl"/>, and
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/></para>
+    <para role="optional"><xref linkend="tcl"/>,
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>, and
+    <ulink url="http://www.gnu.org/software/sharutils/">sharutils</ulink>
+    (for the <command>uudecode</command> command)</para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/db"/></para>
@@ -97,23 +99,27 @@
     Note that you must have <application>Tcl</application> installed to run the
     test suite.</para>
 
-    <para>Build for the <application>Berkeley DB</application> test suite by
-    running the following commands (add <parameter>--enable-java</parameter> if
-    you wish to test the java bindings):</para>
+    <para>Build for the <application>Berkeley DB</application> test by running
+    the following commands:</para>
 
 <screen><userinput>cd build_unix &&
-uudecode="no" ../dist/configure --prefix=/usr \
+../dist/configure --prefix=/usr \
                   --enable-test \
                   --enable-tcl  \
-                  --enable-sql  \
                   --with-tcl=/usr/lib &&
 make</userinput></screen>
 
-    <para>To test <application>Berkeley DB</application>, issue the following
-    command:</para>
+    <para>To test the results, start <command>tclsh</command>:</para>
 
-<screen><userinput>echo "source ../test/tcl/test.tcl; run_parallel 5 run_std; exit;" | tclsh</userinput></screen>
+<screen><userinput>tclsh</userinput></screen>
 
+    <para>From the <command>tclsh</command> prompt (<prompt>% </prompt>),
+    run:</para>
+
+<screen><userinput>source ../test/test.tcl
+run_parallel 5 run_std
+exit</userinput></screen>
+
     <para>Clean up the source tree with the following command:</para>
 
 <screen><userinput>make realclean &&
@@ -129,7 +135,7 @@
     in LFS, and you don't add anything to the <command>configure</command>
     script, you'll end up with exactly what you already have. The additional
     parameters you can use are listed in the Command Explanations section
-    below.</para> 
+    below.</para> -->
 
     <note>
       <para>If you plan on installing <application>Berkeley DB</application>
@@ -140,78 +146,45 @@
       <application>GMime</application> program is on the system, the build will
       fail (unless you run the modified <command>./configure</command> command
       shown below). You can run two commands (<command>javac -version</command>
-      and <command>uudecode - -version</command>) to determine what versions are
+      and <command>uudecode --version</command>) to determine what versions are
       installed. You can also download and run a shell script from
       <ulink url="&files-anduin;/jdk-uudecode-check.sh"/> that will alert
       you to a non-working condition. If the identified programs exist on the
       system, you must modify the
-      <command>./configure</command> command as shown below.</para> 
+      <command>./configure</command> command as shown below.</para>
 
-<screen><userinput>uudecode="no" ../dist/configure - -(use the parameters shown below)</userinput></screen>
-    </note> -->
+<screen><userinput>uudecode="no" ../dist/configure --(use the parameters shown below)</userinput></screen>
+    </note>
 
     <para>Install <application>Berkeley DB</application> by running the
     following commands:</para>
 
 <screen><userinput>cd build_unix &&
-uudecode="no" ../dist/configure --prefix=/usr \
+../dist/configure --prefix=/usr \
                   --enable-compat185 \
-                  --enable-cxx \
-                  --enable-sql &&
+                  --enable-cxx &&
 make</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make docdir=/usr/share/doc/db-&db-version; install &&
-touch /usr/include/sqlite.h
 chown -v -R root:root \
+      /usr/bin/berkeley_db_svc \
       /usr/bin/db_* \
-      /usr/bin/dbsql \
-      /usr/include/db{,_185,_cxx,sql}.h \
-      /usr/lib/libdb{,_cxx,_sql}{.a,.so,-5.so,-5.1.{a,la,so}} \
+      /usr/include/db{,_185,_cxx}.h \
+      /usr/lib/libdb{{,_cxx}.a,{,_cxx,_java,_tcl}-4.8.{so,a,la}} \
       /usr/share/doc/db-&db-version;</userinput></screen>
 
-    <para>If you compiled <application>Berkeley DB</application> with
-    <application>TCL</application> support, complete the
-    <application>TCL</application> installation with the following commands
-    while still the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>chown -v root:root \
-      /usr/lib/libdb_tcl{.a,.so,-5.so,-5.1.{a,la,so}}</userinput></screen>
-
-    <para>If you compiled <application>Berkeley DB</application> with
-    <application>Java</application> support, complete the
-    <application>Java</application> installation with the following commands
-    while still the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>chown -v root:root \
-      /usr/lib/libdb_java{.so,-5.so,-5.1{.a,.la,.so,_g.so}} \
-      /usr/lib/db.jar</userinput></screen>
-
-    <para>Finaly, if you've configured <application>Berkeley DB</application>
-    with the <parameter>--enable-sql_compat</parameter> parameter to provide
-    <application>SQLite3</application> compatibility, complete the installation
-    with the following commands while still the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>touch /usr/include/sqlite3.h &&
-chown -v root:root \
-      /usr/bin/sqlite3 \
-      /usr/include/sqlite3.h \
-      /usr/lib/libsqlite3.{a,la,so}</userinput></screen>
-
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para><command>cd build_unix &&
-    uudecode="no" ../dist/configure --prefix=/usr...</command>:
+    ../dist/configure --prefix=/usr...</command>:
     This replaces the normal <command>./configure</command> command, as
     <application>Berkeley DB</application> comes with various
-    build directories for different platforms.  The additional
-    <envar>uudecode="no"</envar> environment variable ensures that
-    the build will complete if <xref linkend="gmime"/> is intsalled.</para>
+    build directories for different platforms.</para>
 
     <para><parameter>--enable-compat185</parameter>: This switch enables
     building the DB-1.85 compatibility API.</para>
@@ -227,25 +200,15 @@
     <application>Java</application> support in DB and creates the
     <filename class='libraryfile'>libdb_java</filename> libraries.</para>
 
-    <para><parameter>--enable-sql</parameter>: Enables SQL support in
-    DB and creates the <filename class='libraryfile'>libdb_sql</filename>
-    libraries.</para>
-
-    <para><parameter>--enable-sql_compat</parameter>: enables building of the
-    <application>SQLite3</application> compatible binaries and libs.</para>
-
     <para><command>make docdir=/usr/share/doc/db-&db-version;
     install</command>: This installs the documentation in
     the standard location instead of
     <filename class='directory'>/usr/docs</filename>.</para>
 
-    <para><command>chown -v -R root:root ...</command>:These commands change
+    <para><command>chown -v -R root:root ...</command>:This command changes
     the ownership of various installed files from the uid:gid of the
     builder to root:root.</para>
 
-    <para><command>touch /usr/include/sqlite3.h</command>: This command updates
-    the timestamp of the installed sqlite3 header.</para>
-
   </sect2>
 
   <sect2 role="content">
@@ -263,10 +226,9 @@
 
       <seglistitem>
         <seg>db_archive, db_checkpoint, db_deadlock, db_dump,
-        db_load, db_printlog, db_recover, db_stat, db_upgrade, db_verify, 
-        dbsql, sqlite3</seg>
-        <seg>libdb.{so,a}, libdb_cxx.{so,a}, libdb_java{_g.so,.{so,a},
-        libdb_tcl.{so,a}, libdb_sql.{so.a} and db.jar</seg>
+        db_load, db_printlog, db_recover, db_stat, db_upgrade, db_verify</seg>
+        <seg>libdb.{so,a}, libdb_cxx.{so,a}, libdb_java.{so,a},
+        libdb_tcl.{so,a} and db.jar</seg>
         <seg>/usr/share/doc/db-&db-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -383,27 +345,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="dbsql">
-        <term><command>dbsql</command></term>
-        <listitem>
-          <para>is a terminal-based front-end to the dbsql library that can
-          evaluate queries interactively and display the results.</para>
-          <indexterm zone="db dbsql">
-            <primary sortas="b-dbsql">dbsql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_sqlite3">
-        <term><command>sqlite3</command></term>
-        <listitem>
-          <para>is a SQLite3 compatable inteface for dbsql.</para>
-          <indexterm zone="db sqlite3">
-            <primary sortas="b-sqlite3">sqlite3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
   </sect2>

Modified: trunk/BOOK/server/mail/exim.xml
===================================================================
--- trunk/BOOK/server/mail/exim.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/server/mail/exim.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -92,8 +92,7 @@
     <xref linkend="cyrus-sasl"/>,
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility),
+    <xref linkend="sqlite"/>,
     <xref linkend="tcpwrappers"/>, and
     <xref linkend="linux-pam"/></para>
 

Modified: trunk/BOOK/server/major/apache.xml
===================================================================
--- trunk/BOOK/server/major/apache.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/server/major/apache.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -84,8 +84,7 @@
     <xref linkend="db"/>,
     <xref linkend="unixodbc"/>,
     <xref linkend="postgresql"/>, and
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility)</para>
+    <xref linkend="sqlite"/></para>
 
     <para>Though you can install APR and APR-util as separate components,
     it is recommended to use the bundled versions that come with the Apache

Modified: trunk/BOOK/server/major/samba3.xml
===================================================================
--- trunk/BOOK/server/major/samba3.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/server/major/samba3.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -92,8 +92,7 @@
 
     <bridgehead renderas="sect4">Optional for Samba4 Support</bridgehead>
     <para role="optional"><xref linkend="gnutls"/> (recommended) and
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility)</para>
+    <xref linkend="sqlite"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/samba3"/></para>

Modified: trunk/BOOK/x/lib/qt.xml
===================================================================
--- trunk/BOOK/x/lib/qt.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/x/lib/qt.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -80,8 +80,7 @@
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
     <xref linkend="unixodbc"/>,
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility), and
+    <xref linkend="sqlite"/>, and
     <ulink url="http://firebird.sourceforge.net/">Firebird</ulink></para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/x/lib/qt4.xml
===================================================================
--- trunk/BOOK/x/lib/qt4.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/x/lib/qt4.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -78,8 +78,7 @@
       <xref linkend="mysql"/>,
       <xref linkend="postgresql"/>,
       <xref linkend="unixodbc"/>, and
-      <xref linkend="sqlite"/> or <xref linkend="db"/>
-      (with <application>SQLite3</application> compatibility)
+      <xref linkend="sqlite"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/x/lib/webkitgtk.xml
===================================================================
--- trunk/BOOK/x/lib/webkitgtk.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/x/lib/webkitgtk.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -69,8 +69,7 @@
     <xref linkend="libsoup"/>,
     <xref linkend="libxslt"/>,
     <xref linkend="pcre"/>,
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility), and
+    <xref linkend="sqlite"/>, and
     <xref linkend="which"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>

Modified: trunk/BOOK/x/lib/xulrunner.xml
===================================================================
--- trunk/BOOK/x/lib/xulrunner.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/x/lib/xulrunner.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -100,8 +100,7 @@
     <filename>.mozconfig</filename> file created below.</para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility) (internal sqlite is
+    <para role="recommended"><xref linkend="sqlite"/> (internal sqlite is
     incompatable with existing or future installations)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Modified: trunk/BOOK/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/BOOK/xsoft/graphweb/firefox.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -122,8 +122,7 @@
     <xref linkend="nspr"/>,
     <xref linkend="nss"/>,
     <xref linkend="startup-notification"/>.
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility),
+    <xref linkend="sqlite"/>,
     <xref linkend="unzip"/>,
     <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing the
     jemalloc code), and

Modified: trunk/BOOK/xsoft/other/balsa.xml
===================================================================
--- trunk/BOOK/xsoft/other/balsa.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/xsoft/other/balsa.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -79,8 +79,7 @@
     <xref linkend="compface"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <xref linkend="libnotify"/>,
-    <xref linkend="sqlite"/> or <xref linkend="db"/>
-    (with <application>SQLite3</application> compatibility), and
+    <xref linkend="sqlite"/>, and
     an <xref linkend="server-mail"/> (that provides a
     <command>sendmail</command> command, note that it is only used if you
     didn't install the recommended <application>libESMTP</application>

Modified: trunk/BOOK/xsoft/other/pidgin.xml
===================================================================
--- trunk/BOOK/xsoft/other/pidgin.xml	2010-10-17 17:44:45 UTC (rev 8642)
+++ trunk/BOOK/xsoft/other/pidgin.xml	2010-10-17 17:55:40 UTC (rev 8643)
@@ -96,8 +96,7 @@
       (required for audio support),
     <xref linkend="evolution-data-server"/>
       (required for Evolution integration),
-    <xref linkend="sqlite"/>  or <xref linkend="db"/>
-      (with <application>SQLite3</application> compatibility)
+    <xref linkend="sqlite"/>
       (required for the Contact Availability Prediction plugin),
     <xref linkend="cyrus-sasl"/>
       (required for Jabber support),




More information about the blfs-book mailing list