[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 2864455cf31674fedcd12c95eeb796dfde7137e7

git git at cross-lfs.org
Thu May 19 06:33:14 PDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  2864455cf31674fedcd12c95eeb796dfde7137e7 (commit)
       via  7b7c2e873b75d9c3815757f3c95870c091663b61 (commit)
       via  db065d5e7db5118ea4d1638117a24174cc636279 (commit)
       via  66a06a619ee6c9401c7e02757817251c1553e1ab (commit)
       via  411eb70ab69aa2e5405693c065f9dca17f385b1f (commit)
       via  1950bb2bb0405a62f301d27e211f513797649153 (commit)
       via  421e729a09968439091061ab499abd79791d04b7 (commit)
      from  279277d27c9cda5abda3b9f50f30132585f18303 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2864455cf31674fedcd12c95eeb796dfde7137e7
Author: Jonathan Norman <jonathan at bluesquarelinux.co.uk>
Date:   Thu May 19 14:33:01 2011 +0100

    Fixed typos in Glib binary descriptions

diff --git a/BOOK/final-system/common/glib.xml b/BOOK/final-system/common/glib.xml
index 700c7a9..52c48a3 100644
--- a/BOOK/final-system/common/glib.xml
+++ b/BOOK/final-system/common/glib.xml
@@ -113,9 +113,9 @@
       <varlistentry id="glib-gettextize">
         <term><command>glib-gettextize</command></term>
         <listitem>
-          <para><command>glib-gettextize<command> helps to prepare a 
+          <para><command>glib-gettextize</command> helps to prepare a 
        source package for being internationalized through gettext. It is a variant of 
-       the <command>gettextize<command> that ships with gettext.</para>
+       the <command>gettextize</command> that ships with gettext.</para>
           <indexterm zone="ch-system-glib glib-gettextize">
             <primary sortas="b-glib-gettextize">glib-gettextize</primary>
           </indexterm>
@@ -146,7 +146,7 @@
       <varlistentry id="gsettings">
         <term><command>gsettings</command></term>
         <listitem>
-          <para><command>gsettings<command> offers a simple commandline interface to 
+          <para><command>gsettings</command> offers a simple commandline interface to 
            <command>GSettings</command>. It lets you get, set or monitor an individual key 
            for changes.</para>
           <indexterm zone="ch-system-glib gsettings">

commit 7b7c2e873b75d9c3815757f3c95870c091663b61
Author: Jonathan Norman <jonathan at bluesquarelinux.co.uk>
Date:   Thu May 19 14:25:25 2011 +0100

    Added description to Glib binaries

diff --git a/BOOK/final-system/common/glib.xml b/BOOK/final-system/common/glib.xml
index 63bcc9f..700c7a9 100644
--- a/BOOK/final-system/common/glib.xml
+++ b/BOOK/final-system/common/glib.xml
@@ -69,7 +69,7 @@
       <varlistentry id="gdbus">
         <term><command>gdbus</command></term>
         <listitem>
-          <para>disc.</para>
+          <para>Introspect and call remote objects.</para>
           <indexterm zone="ch-system-glib gdbus">
             <primary sortas="b-gdbus">gdbus</primary>
           </indexterm>
@@ -79,7 +79,11 @@
       <varlistentry id="gio-querymodules">
         <term><command>gio-querymodules</command></term>
         <listitem>
-          <para>disc.</para>
+          <para><command>gio-querymodules</command> creates a giomodule.cache file
+       in the listed directories. This file lists the implemented extension points
+       for each module that has been found. It is used by GIO at runtime to avoid 
+       opening all modules just to find out which extension points they are
+       implementing.</para>
           <indexterm zone="ch-system-glib gio-querymodules">
             <primary sortas="b-gio-querymodules">gio-querymodules</primary>
           </indexterm>
@@ -89,7 +93,7 @@
       <varlistentry id="glib-compile-schemas">
         <term><command>glib-compile-schemas</command></term>
         <listitem>
-          <para>disc.</para>
+          <para>GSettings schema compiler.</para>
           <indexterm zone="ch-system-glib glib-compile-schemas">
             <primary sortas="b-glib-compile-schemas">glib-compile-schemas</primary>
           </indexterm>
@@ -99,7 +103,7 @@
       <varlistentry id="glib-genmarshal">
         <term><command>glib-genmarshal</command></term>
         <listitem>
-          <para>disc.</para>
+          <para>C code marshaller generation utility for GLib closures.</para>
           <indexterm zone="ch-system-glib glib-genmarshal">
             <primary sortas="b-glib-genmarshal">glib-genmarshal</primary>
           </indexterm>
@@ -109,7 +113,9 @@
       <varlistentry id="glib-gettextize">
         <term><command>glib-gettextize</command></term>
         <listitem>
-          <para>disc.</para>
+          <para><command>glib-gettextize<command> helps to prepare a 
+       source package for being internationalized through gettext. It is a variant of 
+       the <command>gettextize<command> that ships with gettext.</para>
           <indexterm zone="ch-system-glib glib-gettextize">
             <primary sortas="b-glib-gettextize">glib-gettextize</primary>
           </indexterm>
@@ -119,7 +125,7 @@
       <varlistentry id="glib-mkenums">
         <term><command>glib-mkenums</command></term>
         <listitem>
-          <para>disc.</para>
+          <para>C language enum description generation utility.</para>
           <indexterm zone="ch-system-glib glib-mkenums">
             <primary sortas="b-glib-mkenums">glib-mkenums</primary>
           </indexterm>
@@ -129,7 +135,8 @@
       <varlistentry id="gobject-query">
         <term><command>gobject-query</command></term>
         <listitem>
-          <para>disc.</para>
+          <para><command>gobject-query</command> takes a mandatory argument that specifies
+            whether it should iterate over the fundamental types or print a type tree.</para>
           <indexterm zone="ch-system-glib gobject-query">
             <primary sortas="b-gobject-query">gobject-query</primary>
           </indexterm>
@@ -139,7 +146,9 @@
       <varlistentry id="gsettings">
         <term><command>gsettings</command></term>
         <listitem>
-          <para>disc.</para>
+          <para><command>gsettings<command> offers a simple commandline interface to 
+           <command>GSettings</command>. It lets you get, set or monitor an individual key 
+           for changes.</para>
           <indexterm zone="ch-system-glib gsettings">
             <primary sortas="b-gsettings">gsettings</primary>
           </indexterm>
@@ -149,7 +158,8 @@
       <varlistentry id="gtester">
         <term><command>gtester</command></term>
         <listitem>
-          <para>disc.</para>
+          <para><command>gtester</command> is a utility to run unit tests that have been
+             written using the GLib test framework.</para>
           <indexterm zone="ch-system-glib gtester">
             <primary sortas="b-gtester">gtester</primary>
           </indexterm>
@@ -159,7 +169,8 @@
       <varlistentry id="gtester-report">
         <term><command>gtester-report</command></term>
         <listitem>
-          <para>disc.</para>
+          <para><command>gtester-report</command> is a script which converts the XML output
+             generated by gtester into HTML.</para>
           <indexterm zone="ch-system-glib gtester-report">
             <primary sortas="b-gtester-report">gtester-report</primary>
           </indexterm>

commit db065d5e7db5118ea4d1638117a24174cc636279
Author: Jonathan Norman <jonathan at bluesquarelinux.co.uk>
Date:   Thu May 19 14:14:50 2011 +0100

    Updated Pkg-config to 0.26 and added Glib as a new dependancy

diff --git a/BOOK/final-system/alpha-chapter.xml b/BOOK/final-system/alpha-chapter.xml
index 5d76f00..13d53f5 100644
--- a/BOOK/final-system/alpha-chapter.xml
+++ b/BOOK/final-system/alpha-chapter.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/common/glib.xml b/BOOK/final-system/common/glib.xml
new file mode 100644
index 0000000..63bcc9f
--- /dev/null
+++ b/BOOK/final-system/common/glib.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-glib" role="wrap">
+  <?dbhtml filename="glib.html"?>
+
+  <title>Glib-&glib-version;</title>
+
+  <indexterm zone="ch-system-glib">
+    <primary sortas="a-Glib">Glib</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Glib is a tool to help you insert the correct compiler options
+    on the command line when compiling applications and libraries.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Glib</title>
+
+    <para os="a">Prepare Glib for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">To test the results, issue:
+    <userinput>make -k check</userinput>.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-glib" role="content">
+    <title>Contents of Glib</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+        <seg>gdbus, gio-querymodules, glib-compile-schemas, glib-genmarshal,
+        glib-gettextize, glib-mkenums, gobject-query, gsettings, gtester
+        and gtester-report</seg>
+        <seg>libglib-2.0.so, libgmodule-2.0.so, libgthread-2.0.so,
+        libgobject-2.0.so and libgio-2.0.so</seg>
+        <seg>/usr/share/glib-2.0, /usr/share/gtk-doc/html/glib, /usr/lib/glib-2.0
+       and /usr/include/glib-2.0</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gdbus">
+        <term><command>gdbus</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib gdbus">
+            <primary sortas="b-gdbus">gdbus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gio-querymodules">
+        <term><command>gio-querymodules</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib gio-querymodules">
+            <primary sortas="b-gio-querymodules">gio-querymodules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glib-compile-schemas">
+        <term><command>glib-compile-schemas</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib glib-compile-schemas">
+            <primary sortas="b-glib-compile-schemas">glib-compile-schemas</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glib-genmarshal">
+        <term><command>glib-genmarshal</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib glib-genmarshal">
+            <primary sortas="b-glib-genmarshal">glib-genmarshal</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glib-gettextize">
+        <term><command>glib-gettextize</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib glib-gettextize">
+            <primary sortas="b-glib-gettextize">glib-gettextize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glib-mkenums">
+        <term><command>glib-mkenums</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib glib-mkenums">
+            <primary sortas="b-glib-mkenums">glib-mkenums</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gobject-query">
+        <term><command>gobject-query</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib gobject-query">
+            <primary sortas="b-gobject-query">gobject-query</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gsettings">
+        <term><command>gsettings</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib gsettings">
+            <primary sortas="b-gsettings">gsettings</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtester">
+        <term><command>gtester</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib gtester">
+            <primary sortas="b-gtester">gtester</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtester-report">
+        <term><command>gtester-report</command></term>
+        <listitem>
+          <para>disc.</para>
+          <indexterm zone="ch-system-glib gtester-report">
+            <primary sortas="b-gtester-report">gtester-report</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
diff --git a/BOOK/final-system/common/pkg-config.xml b/BOOK/final-system/common/pkg-config.xml
index 5810fa7..8f5e65c 100644
--- a/BOOK/final-system/common/pkg-config.xml
+++ b/BOOK/final-system/common/pkg-config.xml
@@ -27,7 +27,22 @@
 
     <para os="a">Prepare Pkg-config for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
+    GLIB_LIBS="-lglib-2.0" \
+    ./configure --prefix=/usr</userinput></screen>
+
+    <variablelist os="bb">
+      <title>The meaning of the new configure option:</title>
+
+      <varlistentry>
+        <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"</parameter></term>
+        <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
+        <listitem>
+          <para>Pkg-config no longer comes with Glib and because Pkg-config
+        has not been installed itself it needs to be told where Glib is.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para os="c">Compile the package:</para>
 
diff --git a/BOOK/final-system/mips-chapter.xml b/BOOK/final-system/mips-chapter.xml
index 1397178..fe12126 100644
--- a/BOOK/final-system/mips-chapter.xml
+++ b/BOOK/final-system/mips-chapter.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/mips64-64-chapter.xml b/BOOK/final-system/mips64-64-chapter.xml
index f01b5f2..79f91a4 100644
--- a/BOOK/final-system/mips64-64-chapter.xml
+++ b/BOOK/final-system/mips64-64-chapter.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index 22d1d12..0a589b8 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -44,6 +44,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-n32.xml"/>
diff --git a/BOOK/final-system/multilib/glib-64bit.xml b/BOOK/final-system/multilib/glib-64bit.xml
new file mode 100644
index 0000000..5a95438
--- /dev/null
+++ b/BOOK/final-system/multilib/glib-64bit.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-glib" role="wrap">
+  <?dbhtml filename="glib-64bit.html"?>
+
+  <title>Glib-&glib-version; 64Bit</title>
+
+  <indexterm zone="ch-system-glib">
+    <primary sortas="a-Glib">Glib</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/glib.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Glib</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/glib.xml"
+  xpointer="xpointer(id('contents-glib'))"/>
+
+</sect1>
diff --git a/BOOK/final-system/multilib/glib-n32.xml b/BOOK/final-system/multilib/glib-n32.xml
new file mode 100644
index 0000000..13d5935
--- /dev/null
+++ b/BOOK/final-system/multilib/glib-n32.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-glib-n32" role="wrap">
+  <?dbhtml filename="glib-n32.html"?>
+
+  <title>Glib-&glib-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-glib-n32">
+    <primary sortas="a-Glib">Glib</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/glib.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Glib</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-glib" role="."/></para>
+
+  </sect2>
+
+</sect1>
diff --git a/BOOK/final-system/multilib/glib.xml b/BOOK/final-system/multilib/glib.xml
new file mode 100644
index 0000000..939985a
--- /dev/null
+++ b/BOOK/final-system/multilib/glib.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-glib-32" role="wrap">
+  <?dbhtml filename="glib.html"?>
+
+  <title>Glib-&glib-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-glib-32">
+    <primary sortas="a-Glib">Glib</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/glib.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Glib</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-glib" role="."/></para>
+
+  </sect2>
+
+</sect1>
diff --git a/BOOK/final-system/multilib/pkg-config.xml b/BOOK/final-system/multilib/pkg-config.xml
index 6a4cde0..dc0b0da 100644
--- a/BOOK/final-system/multilib/pkg-config.xml
+++ b/BOOK/final-system/multilib/pkg-config.xml
@@ -25,10 +25,26 @@
     href="../common/pkg-config.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+<screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include" \
+  GLIB_LIBS="-lglib-2.0" \
+  CC="gcc ${BUILD64}" \
   ./configure --prefix=/usr \
     --with-pc-path=/usr/share/pkgconfig </userinput></screen>
 
+    <variablelist os="bb">
+      <title>The meaning of the new configure option:</title>
+
+      <varlistentry>
+        <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/libi64/glib-2.0/include"</parameter></term>
+        <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
+        <listitem>
+          <para>Pkg-config no longer comes with Glib and because Pkg-config
+        has not been installed itself it needs to be told where Glib is.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/pkg-config.xml"
     xpointer="xpointer(//*[@os='c'])"/>
diff --git a/BOOK/final-system/ppc-chapter.xml b/BOOK/final-system/ppc-chapter.xml
index 1a2988c..fadfc7f 100644
--- a/BOOK/final-system/ppc-chapter.xml
+++ b/BOOK/final-system/ppc-chapter.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index 867e7bc..c2dc188 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -38,6 +38,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
diff --git a/BOOK/final-system/sparc-chapter.xml b/BOOK/final-system/sparc-chapter.xml
index c94e305..f1d7e1e 100644
--- a/BOOK/final-system/sparc-chapter.xml
+++ b/BOOK/final-system/sparc-chapter.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/sparc64-64-chapter.xml b/BOOK/final-system/sparc64-64-chapter.xml
index d16b74a..f3d3449 100644
--- a/BOOK/final-system/sparc64-64-chapter.xml
+++ b/BOOK/final-system/sparc64-64-chapter.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index ccfe3fc..dee4aed 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -38,6 +38,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
diff --git a/BOOK/final-system/x86-chapter.xml b/BOOK/final-system/x86-chapter.xml
index 8acdce9..83588c8 100644
--- a/BOOK/final-system/x86-chapter.xml
+++ b/BOOK/final-system/x86-chapter.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/x86_64-64-chapter.xml b/BOOK/final-system/x86_64-64-chapter.xml
index f2109f7..13a7b30 100644
--- a/BOOK/final-system/x86_64-64-chapter.xml
+++ b/BOOK/final-system/x86_64-64-chapter.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index 9353476..09dfd34 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -38,6 +38,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 66e2f34..c4cc69e 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
 
 <!ENTITY month "05"> <!-- Use two digits -->
 <!ENTITY month_name "May">
-<!ENTITY day "18"> <!-- Use two digits -->
+<!ENTITY day "19"> <!-- Use two digits -->
 <!ENTITY year "2011"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index f4f9f12..75f49cf 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,12 @@
       <para>May 19, 2011</para>
       <itemizedlist>
         <listitem>
+          <para>[Jonathan] - Added Glib, dependancy of new Pkg-config.</para>
+        </listitem>
+        <listitem>
+          <para>[Jonathan] - Updated Pkg-config to 0.26.</para>
+        </listitem>
+        <listitem>
           <para>[Jonathan] - Updated Bison to 2.5.</para>
         </listitem>
         <listitem>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index ec88c9c..879056e 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -173,6 +173,12 @@
 <!ENTITY gettext-md5 "3dd55b952826d2b32f51308f2f91aa89">
 <!ENTITY gettext-home "&gnu-software;gettext">
 
+<!ENTITY glib-version "2.28.6">
+<!ENTITY glib-size "6,956 KB">
+<!ENTITY glib-url "http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-&glib-version;.tar.bz2">
+<!ENTITY glib-md5 "7d8fc15ae70d5111c0cf2a79d50ef717">
+<!ENTITY glib-home "http://developer.gnome.org/glib/">
+
 <!ENTITY gmp-version "5.0.2">
 <!ENTITY gmp-size "2,025 KB">
 <!ENTITY gmp-url "&gnu;gmp/gmp-&gmp-version;.tar.bz2">
@@ -333,10 +339,10 @@
 <!ENTITY perl-md5 "e7457deea78330c5f8eebb2fd2a45479">
 <!ENTITY perl-home "http://www.perl.org">
 
-<!ENTITY pkg-config-version "0.25">
-<!ENTITY pkg-config-size "968 KB">
+<!ENTITY pkg-config-version "0.26">
+<!ENTITY pkg-config-size "388 KB">
 <!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
-<!ENTITY pkg-config-md5 "a3270bab3f4b69b7dc6dbdacbcae9745">
+<!ENTITY pkg-config-md5 "47525c26a9ba7ba14bf85e01509a7234">
 <!ENTITY pkg-config-home "http://pkgconfig.freedesktop.org/wiki/">
 
 <!ENTITY powerpcutils-version "1.1.3">

commit 66a06a619ee6c9401c7e02757817251c1553e1ab
Author: Jonathan Norman <jonathan at bluesquarelinux.co.uk>
Date:   Thu May 19 12:40:41 2011 +0100

    Updated Bison to 2.5 and added M4 to cross-tools for it

diff --git a/BOOK/cross-tools/alpha-chapter.xml b/BOOK/cross-tools/alpha-chapter.xml
index 29cf33f..c338c9d 100644
--- a/BOOK/cross-tools/alpha-chapter.xml
+++ b/BOOK/cross-tools/alpha-chapter.xml
@@ -16,6 +16,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/common/m4.xml b/BOOK/cross-tools/common/m4.xml
new file mode 100644
index 0000000..c2f5a53
--- /dev/null
+++ b/BOOK/cross-tools/common/m4.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-m4" role="wrap">
+  <?dbhtml filename="m4.html"?>
+
+  <title>M4-&m4-version;</title>
+
+  <indexterm zone="ch-cross-tools-m4">
+    <primary sortas="a-M4">M4</primary>
+    <secondary>temporary system</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/common/m4.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of M4</title>
+
+    <para os="a">Prepare M4 for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/cross-tools</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">Install the package:</para>
+
+<screen os="f"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-m4" role="."/></para>
+
+  </sect2>
+
+</sect1>
diff --git a/BOOK/cross-tools/mips-chapter.xml b/BOOK/cross-tools/mips-chapter.xml
index 1dad311..66a484f 100644
--- a/BOOK/cross-tools/mips-chapter.xml
+++ b/BOOK/cross-tools/mips-chapter.xml
@@ -16,6 +16,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/mips64-64-chapter.xml b/BOOK/cross-tools/mips64-64-chapter.xml
index 841847e..1a6f15b 100644
--- a/BOOK/cross-tools/mips64-64-chapter.xml
+++ b/BOOK/cross-tools/mips64-64-chapter.xml
@@ -17,6 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/mips64-chapter.xml b/BOOK/cross-tools/mips64-chapter.xml
index 197f68c..142cf78 100644
--- a/BOOK/cross-tools/mips64-chapter.xml
+++ b/BOOK/cross-tools/mips64-chapter.xml
@@ -17,6 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/ppc-chapter.xml b/BOOK/cross-tools/ppc-chapter.xml
index f043713..f0226ea 100644
--- a/BOOK/cross-tools/ppc-chapter.xml
+++ b/BOOK/cross-tools/ppc-chapter.xml
@@ -16,6 +16,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/ppc64-chapter.xml b/BOOK/cross-tools/ppc64-chapter.xml
index 954525d..ca83236 100644
--- a/BOOK/cross-tools/ppc64-chapter.xml
+++ b/BOOK/cross-tools/ppc64-chapter.xml
@@ -17,6 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/sparc-chapter.xml b/BOOK/cross-tools/sparc-chapter.xml
index fa0fcda..5c32e49 100644
--- a/BOOK/cross-tools/sparc-chapter.xml
+++ b/BOOK/cross-tools/sparc-chapter.xml
@@ -16,6 +16,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/sparc64-64-chapter.xml b/BOOK/cross-tools/sparc64-64-chapter.xml
index 25d0513..8b5a59e 100644
--- a/BOOK/cross-tools/sparc64-64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-64-chapter.xml
@@ -17,6 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/sparc64-chapter.xml b/BOOK/cross-tools/sparc64-chapter.xml
index f52f759..e1855c5 100644
--- a/BOOK/cross-tools/sparc64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-chapter.xml
@@ -17,6 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/x86-chapter.xml b/BOOK/cross-tools/x86-chapter.xml
index 580f855..bcc81da 100644
--- a/BOOK/cross-tools/x86-chapter.xml
+++ b/BOOK/cross-tools/x86-chapter.xml
@@ -16,6 +16,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/x86_64-64-chapter.xml b/BOOK/cross-tools/x86_64-64-chapter.xml
index 8e950db..15e289e 100644
--- a/BOOK/cross-tools/x86_64-64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-64-chapter.xml
@@ -17,6 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/cross-tools/x86_64-chapter.xml b/BOOK/cross-tools/x86_64-chapter.xml
index 37ad88e..83ce0c6 100644
--- a/BOOK/cross-tools/x86_64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-chapter.xml
@@ -17,6 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
diff --git a/BOOK/final-system/common/kbd.xml b/BOOK/final-system/common/kbd.xml
index 25c349c..b27ce07 100644
--- a/BOOK/final-system/common/kbd.xml
+++ b/BOOK/final-system/common/kbd.xml
@@ -48,7 +48,7 @@
     class="directory">/usr</filename> may not be available during the early
     stages of booting, those binaries need to be on the root partition:</para>
 
-<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont} /bin</userinput></screen>
+<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont, setvtrgb} /bin</userinput></screen>
 
   </sect2>
 
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index c999bf7..f4f9f12 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,16 @@
       <para>May 19, 2011</para>
       <itemizedlist>
         <listitem>
+          <para>[Jonathan] - Updated Bison to 2.5.</para>
+        </listitem>
+        <listitem>
+          <para>[Jonathan] - Added M4 to cross-tools to avoid strstr issue
+        with Bison 2.5.</para>
+        </listitem>
+        <listitem>
+          <para>[Jonathan] - Moved Kbd's setvtrgb from /usr/bin to /bin.</para>
+        </listitem>
+        <listitem>
           <para>[Jonathan] - Updated package contents for Kdb.</para>
         </listitem>
         <listitem>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index b2f2aef..ec88c9c 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -42,10 +42,10 @@
 <!ENTITY binutils-md5 "c84c5acc9d266f1a7044b51c85a823f5">
 <!ENTITY binutils-home "http://sources.redhat.com/binutils">
 
-<!ENTITY bison-version "2.4.3">
-<!ENTITY bison-size "1,616 KB">
+<!ENTITY bison-version "2.5">
+<!ENTITY bison-size "2,030 KB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.bz2">
-<!ENTITY bison-md5 "c1d3ea81bc370dbd43b6f0b2cd21287e">
+<!ENTITY bison-md5 "9dba20116b13fc61a0846b0058fbe004">
 <!ENTITY bison-home "&gnu-software;bison">
 
 <!ENTITY bootscripts-clfs-version "1.2-pre11">

commit 411eb70ab69aa2e5405693c065f9dca17f385b1f
Author: Jonathan Norman <jonathan at bluesquarelinux.co.uk>
Date:   Thu May 19 10:56:20 2011 +0100

    Updated package contents for Kbd

diff --git a/BOOK/final-system/common/kbd.xml b/BOOK/final-system/common/kbd.xml
index 46187f7..25c349c 100644
--- a/BOOK/final-system/common/kbd.xml
+++ b/BOOK/final-system/common/kbd.xml
@@ -60,12 +60,12 @@
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbd_mode,
-        kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
+        <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo,
+        kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
         (link to psfxtable), psfgettable (link to psfxtable), psfstriptable
         (link to psfxtable), psfxtable, resizecons, setfont, setkeycodes,
-        setleds, setmetamode, showconsolefont, showkey, unicode_start, and
-        unicode_stop</seg>
+        setleds, setmetamode, setvtrgb, showconsolefont, showkey,
+        unicode_start, and unicode_stop</seg>
         <seg>/usr/share/consolefonts, /usr/share/consoletrans,
         /usr/share/keymaps, /usr/share/unimaps</seg>
       </seglistitem>
@@ -126,6 +126,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="kbdinfo">
+        <term><command>kbdinfo</command></term>
+        <listitem>
+          <para>Obtains information about the console</para>
+          <indexterm zone="ch-system-kbd kbdinfo">
+            <primary sortas="b-kbdinfo">kbdinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="kbd_mode">
         <term><command>kbd_mode</command></term>
         <listitem>
@@ -280,6 +290,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="setvtrgb">
+        <term><command>setvtrgb</command></term>
+        <listitem>
+          <para>Sets the virtal terminal RGB colors</para>
+          <indexterm zone="ch-system-kbd setvtrgb">
+            <primary sortas="b-setvtrgb">setvtrgb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="showconsolefont">
         <term><command>showconsolefont</command></term>
         <listitem>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index fe4e531..c999bf7 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,10 +40,13 @@
       <para>May 19, 2011</para>
       <itemizedlist>
         <listitem>
-          <para>[Jonathan] - Added es.po fix for KBD 1.15.3.</para>
+          <para>[Jonathan] - Updated package contents for Kdb.</para>
         </listitem>
         <listitem>
-          <para>[Jonathan] - Updated KBD to 1.15.3.</para>
+          <para>[Jonathan] - Added es.po fix for Kdb 1.15.3.</para>
+        </listitem>
+        <listitem>
+          <para>[Jonathan] - Updated Kdb to 1.15.3.</para>
         </listitem>
         <listitem>
           <para>[Jonathan] - Fixed issue with cross PPL using

commit 1950bb2bb0405a62f301d27e211f513797649153
Author: Jonathan Norman <jonathan at bluesquarelinux.co.uk>
Date:   Thu May 19 10:45:46 2011 +0100

    Updated KBD to 1.15.3 and added required es.po patch

diff --git a/BOOK/final-system/common/kbd.xml b/BOOK/final-system/common/kbd.xml
index 84e7e1d..46187f7 100644
--- a/BOOK/final-system/common/kbd.xml
+++ b/BOOK/final-system/common/kbd.xml
@@ -25,6 +25,10 @@
   <sect2 role="installation">
     <title>Installation of Kbd</title>
 
+    <para os="p1">Apply the following patch to fix a typo in es.po:</para>
+
+    <screen os="p2"><userinput>patch -Np1 -i ../&kbd-espo-patch;</userinput></screen>
+
     <para os="a">Prepare Kbd for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
diff --git a/BOOK/final-system/multilib/kbd.xml b/BOOK/final-system/multilib/kbd.xml
index 646f24a..b434573 100644
--- a/BOOK/final-system/multilib/kbd.xml
+++ b/BOOK/final-system/multilib/kbd.xml
@@ -23,6 +23,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 2245787..fe4e531 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,12 @@
       <para>May 19, 2011</para>
       <itemizedlist>
         <listitem>
+          <para>[Jonathan] - Added es.po fix for KBD 1.15.3.</para>
+        </listitem>
+        <listitem>
+          <para>[Jonathan] - Updated KBD to 1.15.3.</para>
+        </listitem>
+        <listitem>
           <para>[Jonathan] - Fixed issue with cross PPL using
           the host's GMP headers.</para>
         </listitem>
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index c2d4236..3f76f88 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -100,6 +100,15 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Kbd es.po Fix Patch - <token>&kbd-espo-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&kbd-espo-patch;"/></para>
+        <para>MD5 sum: <literal>&kbd-espo-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Man i18n Patch - <token>&man-i18n-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 9f64527..b2f2aef 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -229,10 +229,10 @@
 <!ENTITY iputils-md5 "a36c25e9ec17e48be514dc0485e7376c">
 <!ENTITY iputils-home "http://www.linuxfoundation.org/en/Net:Iputils">
 
-<!ENTITY kbd-version "1.15.2">
-<!ENTITY kbd-size "1,524 KB">
+<!ENTITY kbd-version "1.15.3">
+<!ENTITY kbd-size "1,660 KB">
 <!ENTITY kbd-url "ftp://devel.altlinux.org/legion/kbd/kbd-&kbd-version;.tar.gz">
-<!ENTITY kbd-md5 "77d0b51454522bc6c170bbdc6e31202a">
+<!ENTITY kbd-md5 "8143e179a0f3c25646ce5085e8777200">
 <!ENTITY kbd-home " ">
 
 <!ENTITY less-version "443">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 29f3be3..d4fed63 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -44,6 +44,10 @@
 <!ENTITY iputils-doc-patch-md5 "2eee5e095005bf4be426797a4aefa27b">
 <!ENTITY iputils-doc-patch-size "136 KB">
 
+<!ENTITY kbd-espo-patch "kbd-&kbd-version;-es.po_fix-1.patch">
+<!ENTITY kbd-espo-patch-md5 "476c4066c5c663b44b67acaa4cdef62e">
+<!ENTITY kbd-espo-patch-size "1 KB">
+
 <!ENTITY man-i18n-patch "man-&man-version;-i18n-1.patch">
 <!ENTITY man-i18n-patch-md5 "a5aba0cb5a95a7945db8c882334b7dab">
 <!ENTITY man-i18n-patch-size "12 KB">
diff --git a/patches/kbd-1.15.3-es.po_fix-1.patch b/patches/kbd-1.15.3-es.po_fix-1.patch
new file mode 100644
index 0000000..d90ce3f
--- /dev/null
+++ b/patches/kbd-1.15.3-es.po_fix-1.patch
@@ -0,0 +1,18 @@
+Submitted By: Jonathan Norman <jonathan dot bluesquarelinux.co.uk>
+Date: 2011-05-17
+Initial Package Version: 1.15.3 
+Origin: Arch Linux
+Upstream Status: Unknown
+Description: Fixes mistake in es.po file.
+
+--- kbd-1.15.3/po/es.old	2011-05-14 23:12:49.000000000 +0200
++++ kbd-1.15.3/po/es.po	2011-05-15 21:07:02.120669404 +0200
+@@ -1363,7 +1363,7 @@
+ #: src/setfont.c:682
+ #, c-format
+ msgid "Saved %d-char %dx%d font file on %s\n"
+-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
+ 
+ #: src/setkeycodes.c:21
+ #, c-format

commit 421e729a09968439091061ab499abd79791d04b7
Author: Jonathan Norman <jonathan at bluesquarelinux.co.uk>
Date:   Thu May 19 10:11:12 2011 +0100

    Fixed issue with cross PPL using the host's GMP headers

diff --git a/BOOK/cross-tools/common/ppl.xml b/BOOK/cross-tools/common/ppl.xml
index 2cc923d..b066ec3 100644
--- a/BOOK/cross-tools/common/ppl.xml
+++ b/BOOK/cross-tools/common/ppl.xml
@@ -24,7 +24,8 @@
 
     <para os="a">Prepare PPL for compilation:</para>
 
-<screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+<screen os="b"><userinput>CPPFLAGS="-I/cross-tools/include" \
+    LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
     ./configure --prefix=/cross-tools --enable-shared \
     --enable-interfaces="c,cxx" --disable-optimization \
     --with-libgmp-prefix=/cross-tools \
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index cbe0624..2245787 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,17 @@
 -->
 
     <listitem>
+      <para>May 19, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Fixed issue with cross PPL using
+          the host's GMP headers.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+
+    <listitem>
       <para>May 18, 2011</para>
       <itemizedlist>
         <listitem>

-----------------------------------------------------------------------

Summary of changes:
 BOOK/cross-tools/alpha-chapter.xml                 |    1 +
 .../common/sed.xml => cross-tools/common/m4.xml}   |   21 +--
 BOOK/cross-tools/common/ppl.xml                    |    3 +-
 BOOK/cross-tools/mips-chapter.xml                  |    1 +
 BOOK/cross-tools/mips64-64-chapter.xml             |    1 +
 BOOK/cross-tools/mips64-chapter.xml                |    1 +
 BOOK/cross-tools/ppc-chapter.xml                   |    1 +
 BOOK/cross-tools/ppc64-chapter.xml                 |    1 +
 BOOK/cross-tools/sparc-chapter.xml                 |    1 +
 BOOK/cross-tools/sparc64-64-chapter.xml            |    1 +
 BOOK/cross-tools/sparc64-chapter.xml               |    1 +
 BOOK/cross-tools/x86-chapter.xml                   |    1 +
 BOOK/cross-tools/x86_64-64-chapter.xml             |    1 +
 BOOK/cross-tools/x86_64-chapter.xml                |    1 +
 BOOK/final-system/alpha-chapter.xml                |    1 +
 BOOK/final-system/common/glib.xml                  |  184 ++++++++++++++++++++
 BOOK/final-system/common/kbd.xml                   |   34 +++-
 BOOK/final-system/common/pkg-config.xml            |   17 ++-
 BOOK/final-system/mips-chapter.xml                 |    1 +
 BOOK/final-system/mips64-64-chapter.xml            |    1 +
 BOOK/final-system/mips64-chapter.xml               |    3 +
 .../multilib/{bison-64bit.xml => glib-64bit.xml}   |   30 ++--
 .../multilib/{bison-n32.xml => glib-n32.xml}       |   28 ++--
 BOOK/final-system/multilib/{bison.xml => glib.xml} |   28 ++--
 BOOK/final-system/multilib/kbd.xml                 |    8 +
 BOOK/final-system/multilib/pkg-config.xml          |   18 ++-
 BOOK/final-system/ppc-chapter.xml                  |    1 +
 BOOK/final-system/ppc64-chapter.xml                |    2 +
 BOOK/final-system/sparc-chapter.xml                |    1 +
 BOOK/final-system/sparc64-64-chapter.xml           |    1 +
 BOOK/final-system/sparc64-chapter.xml              |    2 +
 BOOK/final-system/x86-chapter.xml                  |    1 +
 BOOK/final-system/x86_64-64-chapter.xml            |    1 +
 BOOK/final-system/x86_64-chapter.xml               |    2 +
 BOOK/general.ent                                   |    2 +-
 BOOK/introduction/common/changelog.xml             |   36 ++++
 BOOK/materials/common/patches.xml                  |    9 +
 BOOK/packages.ent                                  |   24 ++-
 BOOK/patches.ent                                   |    4 +
 patches/kbd-1.15.3-es.po_fix-1.patch               |   18 ++
 40 files changed, 421 insertions(+), 72 deletions(-)
 copy BOOK/{temp-system/common/sed.xml => cross-tools/common/m4.xml} (61%)
 create mode 100644 BOOK/final-system/common/glib.xml
 copy BOOK/final-system/multilib/{bison-64bit.xml => glib-64bit.xml} (68%)
 copy BOOK/final-system/multilib/{bison-n32.xml => glib-n32.xml} (70%)
 copy BOOK/final-system/multilib/{bison.xml => glib.xml} (70%)
 create mode 100644 patches/kbd-1.15.3-es.po_fix-1.patch


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list