r3205 - in trunk: BOOK BOOK/basicnet/mailnews BOOK/basicnet/netprogs BOOK/basicnet/netutils BOOK/content/databases BOOK/general/genlib BOOK/general/genutils BOOK/general/graphlib BOOK/general/prog BOOK/gnome/add BOOK/gnome/core BOOK/gnome/otherlibs BOOK/introduction/welcome BOOK/kde/add BOOK/multimedia/libdriv BOOK/postlfs/editors BOOK/pst/printing BOOK/server/other BOOK/xsoft/office BOOK/xsoft/suites patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Thu Jan 6 07:31:21 PST 2005


Author: igor
Date: 2005-01-06 08:31:17 -0700 (Thu, 06 Jan 2005)
New Revision: 3205

Added:
   trunk/patches/Python-2.4-gdbm-1.patch
Removed:
   trunk/patches/Python-2.3.4-gdbm-1.patch
Modified:
   trunk/BOOK/basicnet/mailnews/fetchmail.xml
   trunk/BOOK/basicnet/netprogs/subversion.xml
   trunk/BOOK/basicnet/netutils/ethereal.xml
   trunk/BOOK/content/databases/postgresql.xml
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/libglade.xml
   trunk/BOOK/general/genlib/libxml2.xml
   trunk/BOOK/general/genlib/libxslt.xml
   trunk/BOOK/general/genutils/pilot-link.xml
   trunk/BOOK/general/graphlib/lcms.xml
   trunk/BOOK/general/prog/doxygen.xml
   trunk/BOOK/general/prog/pdl.xml
   trunk/BOOK/general/prog/python.xml
   trunk/BOOK/gnome/add/gnome-doc-utils.xml
   trunk/BOOK/gnome/core/vte.xml
   trunk/BOOK/gnome/otherlibs/libglade14.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/kde/add/kdebindings.xml
   trunk/BOOK/kde/add/kdevelop.xml
   trunk/BOOK/multimedia/libdriv/gstreamer.xml
   trunk/BOOK/postlfs/editors/vim.xml
   trunk/BOOK/pst/printing/cups.xml
   trunk/BOOK/server/other/samba3.xml
   trunk/BOOK/xsoft/office/gimp.xml
   trunk/BOOK/xsoft/office/gnumeric.xml
   trunk/BOOK/xsoft/suites/koffice.xml
Log:
Updated to Python-2.4.

Modified: trunk/BOOK/basicnet/mailnews/fetchmail.xml
===================================================================
--- trunk/BOOK/basicnet/mailnews/fetchmail.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/basicnet/mailnews/fetchmail.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -34,7 +34,7 @@
 <listitem><para>Download (FTP): <ulink
 url="&fetchmail-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &fetchmail-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &fetchmail-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &fetchmail-time;</para></listitem></itemizedlist>
@@ -49,7 +49,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="Python"/> and <xref linkend="tk"/>.</para>
+<para><xref linkend="python"/> and <xref linkend="tk"/>.</para>
 </sect4>
 </sect3>
 

Modified: trunk/BOOK/basicnet/netprogs/subversion.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/subversion.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/basicnet/netprogs/subversion.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -54,7 +54,7 @@
 <xref linkend="pkgconfig"/>, 
 <xref linkend="db"/>, 
 <xref linkend="gdbm"/>, 
-<xref linkend="Python"/>, 
+<xref linkend="python"/>, 
 <xref linkend="apache"/>, 
 <xref linkend="j2sdk"/>, 
 <xref linkend="openssl"/>, 

Modified: trunk/BOOK/basicnet/netutils/ethereal.xml
===================================================================
--- trunk/BOOK/basicnet/netutils/ethereal.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/basicnet/netutils/ethereal.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -62,7 +62,7 @@
 <acronym>GUI</acronym> front-end), 
 <xref linkend="openssl"/>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
-<xref linkend="Python"/>, 
+<xref linkend="python"/>, 
 <xref linkend="pcre"/>, 
 <xref linkend="doxygen"/>, 
 <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink> and 

Modified: trunk/BOOK/content/databases/postgresql.xml
===================================================================
--- trunk/BOOK/content/databases/postgresql.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/content/databases/postgresql.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -49,7 +49,7 @@
 dependencies</title>
 <sect4><title>Optional</title>
 <para>
-<xref linkend="Python"/>,
+<xref linkend="python"/>,
 <xref linkend="tcl"/>,
 <xref linkend="tk"/>,
 <xref linkend="openssl"/>,

Modified: trunk/BOOK/general/genlib/libglade.xml
===================================================================
--- trunk/BOOK/general/genlib/libglade.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/general/genlib/libglade.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -49,7 +49,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="Python"/> 
+<para><xref linkend="python"/> 
 and <xref linkend="gtk-doc"/></para>
 </sect4>
 </sect3>

Modified: trunk/BOOK/general/genlib/libxml2.xml
===================================================================
--- trunk/BOOK/general/genlib/libxml2.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/general/genlib/libxml2.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -41,7 +41,7 @@
 
 <sect3><title><application>libxml2</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="Python"/></para></sect4>
+<para><xref linkend="python"/></para></sect4>
 </sect3>
 
 </sect2>

Modified: trunk/BOOK/general/genlib/libxslt.xml
===================================================================
--- trunk/BOOK/general/genlib/libxslt.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/general/genlib/libxslt.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -45,7 +45,7 @@
 <para><xref linkend="libxml2"/></para></sect4>
 <sect4><title>Optional</title>
 <para>
-<xref linkend="Python"/> and
+<xref linkend="python"/> and
 <ulink url="http://directory.fsf.org/security/libgcrypt.html">libgcrypt</ulink>
 </para></sect4>
 </sect3>

Modified: trunk/BOOK/general/genutils/pilot-link.xml
===================================================================
--- trunk/BOOK/general/genutils/pilot-link.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/general/genutils/pilot-link.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -54,7 +54,7 @@
 <para><xref linkend="libpng"/>, 
 <xref linkend="j2sdk"/>, 
 <xref linkend="tcl"/>, 
-<xref linkend="Python"/> and 
+<xref linkend="python"/> and 
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
 </sect4>
 </sect3>

Modified: trunk/BOOK/general/graphlib/lcms.xml
===================================================================
--- trunk/BOOK/general/graphlib/lcms.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/general/graphlib/lcms.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -32,7 +32,7 @@
 <listitem><para>Download (FTP): <ulink
 url="&lcms-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &lcms-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &lcms-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &lcms-time;</para></listitem></itemizedlist>
@@ -41,7 +41,7 @@
 <sect3><title><application>lcms</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="libtiff"/>, 
-<xref linkend="libjpeg"/>, <xref linkend="Python"/> and 
+<xref linkend="libjpeg"/>, <xref linkend="python"/> and 
 <ulink url="http://www.swig.org/">SWIG</ulink></para></sect4>
 </sect3>
 

Modified: trunk/BOOK/general/prog/doxygen.xml
===================================================================
--- trunk/BOOK/general/prog/doxygen.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/general/prog/doxygen.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -52,7 +52,7 @@
 <sect3><title><application>Doxygen</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="qt"/>, 
-<xref linkend="Python"/>, 
+<xref linkend="python"/>, 
 <xref linkend="pst-typesetting-tex"/>, 
 <xref linkend="gs"/> or <xref linkend="espgs"/>, and 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink></para>

Modified: trunk/BOOK/general/prog/pdl.xml
===================================================================
--- trunk/BOOK/general/prog/pdl.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/general/prog/pdl.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -182,7 +182,7 @@
 <xref linkend="gnome-libs"/>, 
 <xref linkend="j2sdk"/>, 
 <xref linkend="tk"/>, 
-<xref linkend="Python"/> (with the 
+<xref linkend="python"/> (with the 
 <ulink url="http://www.pfdubois.com/numpy/">Numerical Extension</ulink>), 
 <xref linkend="gcc"/> (Fortran compiler), 
 <ulink url="http://www.swig.org/">SWIG</ulink>, 

Modified: trunk/BOOK/general/prog/python.xml
===================================================================
--- trunk/BOOK/general/prog/python.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/general/prog/python.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -4,20 +4,20 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY Python-download-http "http://www.python.org/ftp/python/&Python-version;/Python-&Python-version;.tar.bz2">
-<!ENTITY Python-download-ftp "ftp://ftp.python.org/pub/python/&Python-version;/Python-&Python-version;.tar.bz2">
-<!ENTITY Python-size "7.2 MB">
-<!ENTITY Python-buildsize "133 MB">
-<!ENTITY Python-time "1.25 SBU">
+<!ENTITY python-download-http "http://www.python.org/ftp/python/&python-version;/python-&python-version;.tar.bz2">
+<!ENTITY python-download-ftp "ftp://ftp.python.org/pub/python/&python-version;/python-&python-version;.tar.bz2">
+<!ENTITY python-size "7.5 MB">
+<!ENTITY python-buildsize "133 MB">
+<!ENTITY python-time "1.01 SBU">
 ]>
 
-<sect1 id="Python" xreflabel="Python-&Python-version;">
+<sect1 id="python" xreflabel="Python-&python-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="Python.html" ?>
-<title>Python-&Python-version;</title>
+<title>Python-&python-version;</title>
 
 <sect2>
 <title>Introduction to <application>Python</application></title>
@@ -29,25 +29,26 @@
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&Python-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&Python-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &Python-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &Python-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &Python-time;</para></listitem></itemizedlist>
+<listitem><para>Download (HTTP): <ulink url="&python-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&python-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &python-size;</para></listitem>
+<listitem><para>Estimated disk space required: &python-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &python-time;</para></listitem></itemizedlist>
 </sect3>
 
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink
-url="&patch-root;/Python-&Python-version;-gdbm-1.patch"/></para></listitem>
+<listitem><para>Required patch: <ulink
+url="&patch-root;/Python-&python-version;-gdbm-1.patch"/></para></listitem>
 </itemizedlist>
 </sect3>
 
 <sect3><title><application>Python</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/>, <xref linkend="tk"/>, 
-<xref linkend="gdbm"/>, <xref linkend="db"/>, <xref linkend="gmp"/> and 
-<ulink url="http://www.gnu.org/software/pth/">Pth</ulink></para>
+<para><xref linkend="openssl"/>,
+<xref linkend="tk"/>, 
+<xref linkend="gdbm"/> and
+<xref linkend="db"/></para>
 </sect4>
 </sect3>
 
@@ -59,7 +60,7 @@
 <para>Install <application>Python</application> by running the following
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../Python-&Python-version;-gdbm-1.patch &&
+<screen><userinput><command>patch -Np1 -i ../Python-&python-version;-gdbm-1.patch &&
 ./configure --prefix=/usr --enable-shared &&
 make &&
 make install</command></userinput></screen>
@@ -70,7 +71,9 @@
 <title>Contents</title>
 
 <para>The <application>Python</application> package contains
-<command>python</command>, <command>pydoc</command> and
+<command>python</command>,
+<command>pydoc</command>,
+<command>smtpd.py</command> and
 <application>Python</application> libraries, modules and scripts. If
 <application>Tk</application> is installed, the <command>idle</command>
 script will also be installed.</para>
@@ -87,6 +90,10 @@
 <para><command>pydoc</command> is the <application>Python</application>
 documentation tool.</para></sect3>
 
+<sect3><title>smtpd.py</title>
+<para><command>smtpd.py</command> is a <acronym>SMTP</acronym> proxy
+implemented in <application>Python</application>.</para></sect3>
+
 <sect3><title>idle</title>
 <para><command>idle</command> is a wrapper script that opens a
 <application>Python</application> aware <acronym>GUI</acronym>
@@ -95,4 +102,3 @@
 </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/general.ent	2005-01-06 15:31:17 UTC (rev 3205)
@@ -1,4 +1,4 @@
-<!ENTITY day          "05">
+<!ENTITY day          "06">
 <!ENTITY month        "01">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -129,7 +129,7 @@
 <!ENTITY apache-ant-version           "1.6.2">
                                      
 <!-- Chapter 12 -->                  
-<!ENTITY Python-version               "2.3.4">
+<!ENTITY python-version               "2.4">
 <!ENTITY LFS-Perl-version             "5.8.5">
 <!ENTITY Module-Info-version          "0.26">
 <!ENTITY Gtk-Perl-version             "0.7009">

Modified: trunk/BOOK/gnome/add/gnome-doc-utils.xml
===================================================================
--- trunk/BOOK/gnome/add/gnome-doc-utils.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/gnome/add/gnome-doc-utils.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -57,7 +57,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="pkgconfig"/> and <xref linkend="Python"/></para>
+<para><xref linkend="pkgconfig"/> and <xref linkend="python"/></para>
 </sect4>
 </sect3>
 

Modified: trunk/BOOK/gnome/core/vte.xml
===================================================================
--- trunk/BOOK/gnome/core/vte.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/gnome/core/vte.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -43,7 +43,7 @@
 <sect3><title><application>VTE</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="gtk2"/> and 
-<xref linkend="Python"/></para>
+<xref linkend="python"/></para>
 </sect4>
 
 <sect4><title>Optional</title>

Modified: trunk/BOOK/gnome/otherlibs/libglade14.xml
===================================================================
--- trunk/BOOK/gnome/otherlibs/libglade14.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/gnome/otherlibs/libglade14.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -48,7 +48,7 @@
 <sect4><title>Optional</title>
 <para><xref linkend="gnome-libs"/>, 
 <xref linkend="bonobo14"/>, 
-<xref linkend="Python"/> and 
+<xref linkend="python"/> and 
 <xref linkend="gtk-doc"/></para>
 </sect4>
 </sect3>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>January 6th, 2004 [igor]: Updated to
+Python-2.4.</para></listitem>
+
 <listitem><para>January 5th, 2004 [igor]: Updated to GLib-2.6.0,
 Pango-1.8.0, ATK-1.9.0, libtiff-3.7.1, GTK+-2.6.0 and
 Tcl/Tk-8.4.9.</para></listitem>

Modified: trunk/BOOK/kde/add/kdebindings.xml
===================================================================
--- trunk/BOOK/kde/add/kdebindings.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/kde/add/kdebindings.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -58,7 +58,7 @@
 <sect4><title>Optional</title>
 <para><xref linkend="GLib"/>, 
 <xref linkend="GTK"/>,
-<xref linkend="Python"/>,
+<xref linkend="python"/>,
 <xref linkend="ruby-package"/>,
 <xref linkend="j2sdk"/>,
 <xref linkend="mozilla"/>, 

Modified: trunk/BOOK/kde/add/kdevelop.xml
===================================================================
--- trunk/BOOK/kde/add/kdevelop.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/kde/add/kdevelop.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -47,7 +47,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="Python"/>, 
+<para><xref linkend="python"/>, 
 <ulink url="http://sourceforge.net/projects/docbase/">DocBase</ulink>, 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink> 
 and <xref linkend="doxygen"/></para>

Modified: trunk/BOOK/multimedia/libdriv/gstreamer.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gstreamer.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/multimedia/libdriv/gstreamer.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -53,7 +53,7 @@
 
 <sect4><title>Optional</title>
 <para><xref linkend="libgnomeui"/>, 
-<xref linkend="Python"/> and 
+<xref linkend="python"/> and 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
 </sect4>
 

Modified: trunk/BOOK/postlfs/editors/vim.xml
===================================================================
--- trunk/BOOK/postlfs/editors/vim.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/postlfs/editors/vim.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -65,7 +65,7 @@
 <sect4><title>Optional</title>
 <para><xref linkend="gtk2"/>, 
 <xref linkend="lesstif"/>, 
-<xref linkend="Python"/>, 
+<xref linkend="python"/>, 
 <xref linkend="tcl"/>, 
 <xref linkend="ruby-package"/> 
 and <xref linkend="gpm"/>

Modified: trunk/BOOK/pst/printing/cups.xml
===================================================================
--- trunk/BOOK/pst/printing/cups.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/pst/printing/cups.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -47,7 +47,7 @@
 <ulink url="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</ulink> and
 <ulink url="ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/opencdk/">opencdk</ulink>, 
 in that order), <xref linkend="Linux_PAM"/>, <xref linkend="php"/>, 
-<xref linkend="Python"/>, <xref linkend="j2sdk"/>, 
+<xref linkend="python"/>, <xref linkend="j2sdk"/>, 
 <ulink url="http://www.openslp.org/">OpenSLP</ulink>, <ulink 
 url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink> and 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink> (optionally used if 

Modified: trunk/BOOK/server/other/samba3.xml
===================================================================
--- trunk/BOOK/server/other/samba3.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/server/other/samba3.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -57,7 +57,7 @@
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
 <xref linkend="libxml2"/>,
 <xref linkend="mysql"/> or <xref linkend="postgresql"/>,
-<xref linkend="Python"/>, 
+<xref linkend="python"/>, 
 <xref linkend="xinetd"/>, 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink> and 
 <xref linkend="stunnel-package"/> (used to encrypt access to SWAT)</para>

Modified: trunk/BOOK/xsoft/office/gimp.xml
===================================================================
--- trunk/BOOK/xsoft/office/gimp.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/xsoft/office/gimp.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -42,18 +42,6 @@
 &gimp-time;</para></listitem></itemizedlist>
 </sect3>
 
-<!--
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (FTP): <ulink
-url="ftp://ftp.gimp.org/pub/gimp/fonts/freefonts-0.10.tar.gz"/></para>
-</listitem>
-<listitem><para>Download (FTP): <ulink
-url="ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.5/gimp-data-extras-1.2.0.tar.bz2"/>
-</para></listitem></itemizedlist>
-</sect3>
--->
-
 <sect3><title><application><acronym>GIMP</acronym></application> 
 dependencies</title>
 <sect4><title>Required</title>
@@ -70,7 +58,7 @@
 <xref linkend="aalib"/>, 
 <xref linkend="lcms"/>, 
 <xref linkend="libgtkhtml"/>, 
-<xref linkend="Python"/> (and 
+<xref linkend="python"/> (and 
 <ulink url="http://www.pygtk.org/">PyGTK</ulink>), 
 <xref linkend="perl-modules"/>: XML-Parser, 
 <xref linkend="gtk-doc"/>, 

Modified: trunk/BOOK/xsoft/office/gnumeric.xml
===================================================================
--- trunk/BOOK/xsoft/office/gnumeric.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/xsoft/office/gnumeric.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -47,7 +47,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="Python"/>, 
+<para><xref linkend="python"/>, 
 <ulink url="http://www.pygtk.org/">PyGTK</ulink>, 
 <ulink url="http://www.gnome-db.org/download.php">libgnomedb</ulink> 
 (requires <ulink url="http://www.gnome-db.org/download.php">libgda</ulink>), 

Modified: trunk/BOOK/xsoft/suites/koffice.xml
===================================================================
--- trunk/BOOK/xsoft/suites/koffice.xml	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/BOOK/xsoft/suites/koffice.xml	2005-01-06 15:31:17 UTC (rev 3205)
@@ -80,7 +80,7 @@
 
 <sect4><title>Optional</title>
 <para><xref linkend="aspell"/>, 
-<xref linkend="Python"/>, 
+<xref linkend="python"/>, 
 <xref linkend="imagemagick"/>, 
 <ulink url="http://sourceforge.net/projects/wvware/">libwv2</ulink>, 
 <ulink 

Deleted: trunk/patches/Python-2.3.4-gdbm-1.patch
===================================================================
--- trunk/patches/Python-2.3.4-gdbm-1.patch	2005-01-06 00:17:05 UTC (rev 3204)
+++ trunk/patches/Python-2.3.4-gdbm-1.patch	2005-01-06 15:31:17 UTC (rev 3205)
@@ -1,32 +0,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 2003-12-26
-Initial Package Version: 2.3.3
-Origin: Greg Schafer and Jim Gifford
-Description: Fixes Python build issue with gdbm
-
-       *** WARNING: renaming "dbm" since importing it failed:                         
-       build/lib.linux-i686-2.3/dbm.so: undefined symbol: dbm_firstkey  
-
-
- 
-$LastChangedBy$
-$Date$
-
-diff -Naur Python-2.3.2.orig/setup.py Python-2.3.2/setup.py
---- Python-2.3.2.orig/setup.py	2003-09-22 01:19:45.000000000 +0000
-+++ Python-2.3.2/setup.py	2003-10-13 06:28:34.000000000 +0000
-@@ -596,12 +596,12 @@
-                 if self.compiler.find_library_file(lib_dirs, 'ndbm'):
-                     ndbm_libs = ['ndbm']
-                 else:
--                    ndbm_libs = []
-+                    ndbm_libs = ['gdbm', 'gdbm_compat']
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
-                                        define_macros=[('HAVE_NDBM_H',None)],
-                                        libraries = ndbm_libs ) )
-             elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
--                  and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
-+                  and find_file("ndbm.h", inc_dirs, []) is not None):
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
-                                        define_macros=[('HAVE_GDBM_NDBM_H',None)],
-                                        libraries = ['gdbm'] ) )

Copied: trunk/patches/Python-2.4-gdbm-1.patch (from rev 3204, trunk/patches/Python-2.3.4-gdbm-1.patch)




More information about the blfs-book mailing list