Index: general/general.ent
===================================================================
--- general/general.ent	(revision d9454bbf84542281e91497b90f237e414035cc5a)
+++ general/general.ent	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
@@ -14,4 +14,5 @@
 <!ENTITY % gdbm SYSTEM "genlib/gdbm/gdbm.ent">
 <!ENTITY % glib SYSTEM "genlib/glib/glib.ent">
+<!ENTITY % glib2 SYSTEM "genlib/glib2/glib2.ent">
 <!ENTITY % expat SYSTEM "genlib/expat/expat.ent">
 <!ENTITY % readline SYSTEM "genlib/readline/readline.ent">
@@ -36,4 +37,5 @@
 %gdbm;
 %glib;
+%glib2;
 %expat;
 %readline;
Index: general/genlib/glib/glib.ent
===================================================================
--- general/genlib/glib/glib.ent	(revision d9454bbf84542281e91497b90f237e414035cc5a)
+++ general/genlib/glib/glib.ent	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
@@ -9,14 +9,2 @@
 <!ENTITY GLib-buildsize "7 MB">
 <!ENTITY GLib-time "0.26 SBU">
-
-<!ENTITY GLib2 SYSTEM "../glib2.xml">
-<!ENTITY GLib2-intro SYSTEM "glib2-intro.xml">
-<!ENTITY GLib2-inst SYSTEM "glib2-inst.xml">
-<!ENTITY GLib2-exp SYSTEM "glib2-exp.xml">
-<!ENTITY GLib2-desc SYSTEM "glib2-desc.xml">
-<!ENTITY GLib2-version "2.2.3">
-<!ENTITY GLib2-download-http "http://gd.tuwien.ac.at/graphics/gimp/gtk/v2.2/glib-&GLib2-version;.tar.bz2">
-<!ENTITY GLib2-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-&GLib2-version;.tar.bz2">
-<!ENTITY GLib2-size "1.6 MB">
-<!ENTITY GLib2-buildsize "23.3 MB">
-<!ENTITY GLib2-time "0.49 SBU">
Index: neral/genlib/glib/glib2-desc.xml
===================================================================
--- general/genlib/glib/glib2-desc.xml	(revision d9454bbf84542281e91497b90f237e414035cc5a)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application>glib</application> package contains <filename>libglib-2.0</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>GLib libraries</title>
-<para>GLib libraries contain a low-level core library for the
-<application><acronym>GIMP</acronym></application> Toolkit.</para></sect3>
-
-
-</sect2>
-
Index: neral/genlib/glib/glib2-exp.xml
===================================================================
--- general/genlib/glib/glib2-exp.xml	(revision d9454bbf84542281e91497b90f237e414035cc5a)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><option>--enable-gtk-doc</option>: This switch will rebuild
-the <acronym>API</acronym> documentation during the
-<command>make</command> command.</para>
-
-</sect2>
-
Index: neral/genlib/glib/glib2-inst.xml
===================================================================
--- general/genlib/glib/glib2-inst.xml	(revision d9454bbf84542281e91497b90f237e414035cc5a)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect2>
-<title>Installation of <application>GLib</application></title>
-
-<para>Install <application>glib</application> by running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: neral/genlib/glib/glib2-intro.xml
===================================================================
--- general/genlib/glib/glib2-intro.xml	(revision d9454bbf84542281e91497b90f237e414035cc5a)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<sect2>
-<title>Introduction to <application>GLib</application></title>
-
-<para>The <application>glib</application> package contains a low-level core 
-library. This is useful for providing data structure handling for C, 
-portability wrappers and interfaces for such runtime functionality as an 
-event loop, threads, dynamic loading, and an object system.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&GLib2-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&GLib2-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &GLib2-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&GLib2-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&GLib2-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>GLib</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="pkgconfig"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/>, <xref linkend="DocBook"/> and <xref
-linkend="docbook-xsl"/></para></sect4>
-</sect3>
-
-</sect2>
Index: general/genlib/glib2/glib2-desc.xml
===================================================================
--- general/genlib/glib2/glib2-desc.xml	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
+++ general/genlib/glib2/glib2-desc.xml	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>glib</application> package contains <filename>libglib-2.0</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>GLib libraries</title>
+<para>GLib libraries contain a low-level core library for the
+<application><acronym>GIMP</acronym></application> Toolkit.</para></sect3>
+
+
+</sect2>
+
Index: general/genlib/glib2/glib2-exp.xml
===================================================================
--- general/genlib/glib2/glib2-exp.xml	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
+++ general/genlib/glib2/glib2-exp.xml	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><option>--enable-gtk-doc</option>: This switch will rebuild
+the <acronym>API</acronym> documentation during the
+<command>make</command> command.</para>
+
+</sect2>
+
Index: general/genlib/glib2/glib2-inst.xml
===================================================================
--- general/genlib/glib2/glib2-inst.xml	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
+++ general/genlib/glib2/glib2-inst.xml	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>GLib</application></title>
+
+<para>Install <application>glib</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: general/genlib/glib2/glib2-intro.xml
===================================================================
--- general/genlib/glib2/glib2-intro.xml	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
+++ general/genlib/glib2/glib2-intro.xml	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
@@ -0,0 +1,30 @@
+<sect2>
+<title>Introduction to <application>GLib</application></title>
+
+<para>The <application>glib</application> package contains a low-level core 
+library. This is useful for providing data structure handling for C, 
+portability wrappers and interfaces for such runtime functionality as an 
+event loop, threads, dynamic loading, and an object system.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&GLib2-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&GLib2-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &GLib2-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&GLib2-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&GLib2-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>GLib</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="pkgconfig"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/>, <xref linkend="DocBook"/> and <xref
+linkend="docbook-xsl"/></para></sect4>
+</sect3>
+
+</sect2>
Index: general/genlib/glib2/glib2.ent
===================================================================
--- general/genlib/glib2/glib2.ent	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
+++ general/genlib/glib2/glib2.ent	(revision 3c263815c3147267a153ea15bd82f6533cc89eb5)
@@ -0,0 +1,11 @@
+<!ENTITY GLib2 SYSTEM "../glib2.xml">
+<!ENTITY GLib2-intro SYSTEM "glib2-intro.xml">
+<!ENTITY GLib2-inst SYSTEM "glib2-inst.xml">
+<!ENTITY GLib2-exp SYSTEM "glib2-exp.xml">
+<!ENTITY GLib2-desc SYSTEM "glib2-desc.xml">
+<!ENTITY GLib2-version "2.2.3">
+<!ENTITY GLib2-download-http "http://gd.tuwien.ac.at/graphics/gimp/gtk/v2.2/glib-&GLib2-version;.tar.bz2">
+<!ENTITY GLib2-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-&GLib2-version;.tar.bz2">
+<!ENTITY GLib2-size "1.6 MB">
+<!ENTITY GLib2-buildsize "23.3 MB">
+<!ENTITY GLib2-time "0.49 SBU">
