Index: general.ent
===================================================================
--- general.ent	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ general.ent	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "04">                   <!-- Always 2 digits -->
+<!ENTITY day          "05">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "November 4th, &year;">
+<!ENTITY releasedate  "November 5th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -159,5 +159,5 @@
 <!ENTITY libgtkhtml-version           "2.11.1">
 <!ENTITY GLib-version                 "1.2.10">
-<!ENTITY glib2-version                "2.31.0">
+<!ENTITY glib2-version                "2.30.1">
 <!ENTITY glibmm-version               "2.24.2">
 <!ENTITY libidl-version               "0.8.14">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ general/genlib/genlib.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -51,6 +51,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgtkhtml.xml"/>
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ general/genlib/glib2.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -7,6 +7,6 @@
   <!ENTITY glib2-download-http "&gnome-download-http;/glib/2.31/glib-&glib2-version;.tar.bz2">
   <!ENTITY glib2-download-ftp  "ftp://ftp.gtk.org/pub/glib/2.31/glib-&glib2-version;.tar.bz2">
-  <!ENTITY glib2-md5sum        "3806d113305cdb5193174de5d354294e">
-  <!ENTITY glib2-size          "5.6 MB">
+  <!ENTITY glib2-md5sum        "921ef2e86e911feb5e21f656f1ac305b">
+  <!ENTITY glib2-size          "7.4 MB">
   <!ENTITY glib2-buildsize     "179 MB">
   <!ENTITY glib2-time          "1.5 SBU (additional 4.0 SBU to run the test suite)">
@@ -65,5 +65,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libffi"/> and ><xref linkend="python"/>
+    <para role="required"><xref linkend="libffi"/> and <xref linkend="python"/>
     <!--<para role="required"><xref linkend="pkgconfig"/> -->
     </para> 
@@ -91,7 +91,7 @@
     file; <quote>Some of the mimetype-related functionality in GIO requires the
     <command>update-mime-database</command> and
-    <command>update-desktop-database</command> utilities, which are part of
+    <command>update-desktop-database</command> utilities</quote>, which are part of
     <xref linkend="shared-mime-info"/> and
-    <xref linkend="desktop-file-utils"/>, respectively.</quote></para>
+    <xref linkend="desktop-file-utils"/>, respectively.</para>
 
     <para condition="html" role="usernotes">User Notes:
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ general/genutils/pinentry.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -78,5 +78,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="GTK"/>,
+    <para role="optional"><!-- <xref linkend="GTK"/>, -->
     <xref linkend="gtk2"/>,
     <xref linkend="qt"/>, and
Index: general/graphlib/imlib.xml
===================================================================
--- general/graphlib/imlib.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ general/graphlib/imlib.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -65,6 +65,7 @@
     <xref linkend="giflib"/></para>
 
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="GTK"/></para>
+    <para role="optional"><xref linkend="GTK"/></para> -->
 
     <para condition="html" role="usernotes">User Notes:
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ general/prog/pdl.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -230,5 +230,4 @@
             <para><!-- <xref linkend="pkgconfig"/>, -->
             <xref linkend="x-window-system"/>,
-            <xref linkend="GTK"/>,
             <xref linkend="freetype2"/>,
             <ulink url="http://www.boutell.com/gd/">GD</ulink>,
Index: general/sysutils/mc.xml
===================================================================
--- general/sysutils/mc.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ general/sysutils/mc.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -95,5 +95,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GLib"/> (untested with Debian patch) or
+    <para role="required"><!-- <xref linkend="GLib"/> (untested with Debian patch) or -->
     <xref linkend="glib2"/></para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ introduction/welcome/changelog.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -41,4 +41,16 @@
 
 -->
+
+    <listitem>
+      <para>November 4th, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove gtk+1, glib1, xmms, gsview.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Return glib to latest stable: glib-2.30.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ kde/add/kdeaddons.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -70,5 +70,5 @@
     <xref linkend="kdegames"/>,
     <xref linkend="db"/>,
-    <xref linkend="xmms"/>, and
+    <!-- <xref linkend="xmms"/>, -->and
     <xref linkend="sdl"/></para>
 
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ kde/add/kdenetwork.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -9,5 +9,5 @@
   <!ENTITY kdenetwork-size          "8.9 MB">
   <!ENTITY kdenetwork-buildsize     "155 MB (additional 24 MB for API docs)">
-  <!ENTITY kdenetwork-time          "13.5 SBU (additional 0.1 SBU for API docs">
+  <!ENTITY kdenetwork-time          "13.5 SBU (additional 0.1 SBU for API docs)">
 ]>
 
@@ -69,5 +69,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="ppp"/>,
-    <xref linkend="xmms"/>,
+    <!-- <xref linkend="xmms"/>, -->
     <xref linkend="graphviz"/>,
     <xref linkend="doxygen"/>,
Index: kde/add/kdeutils.xml
===================================================================
--- kde/add/kdeutils.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ kde/add/kdeutils.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -71,5 +71,5 @@
     Thinkpad support),
     <xref linkend="python"/>,
-    <xref linkend="xmms"/>,
+    <!-- <xref linkend="xmms"/>, -->
     <xref linkend="graphviz"/>, and
     <xref linkend="doxygen"/></para>
Index: kde/devel/kdebindings.xml
===================================================================
--- kde/devel/kdebindings.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ kde/devel/kdebindings.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -79,6 +79,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="GLib"/>,
-    <xref linkend="GTK"/>,
+    <para role="optional"><!-- <xref linkend="GLib"/>,
+    <xref linkend="GTK"/>, -->
     <xref linkend="python"/>,
     <xref linkend="ruby"/>,
Index: multimedia/audioutils/audioutils.xml
===================================================================
--- multimedia/audioutils/audioutils.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ multimedia/audioutils/audioutils.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -25,5 +25,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpg123.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vorbistools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xmms.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xmms.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lame.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cdparanoia.xml"/>
Index: multimedia/audioutils/lame.xml
===================================================================
--- multimedia/audioutils/lame.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ multimedia/audioutils/lame.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -61,5 +61,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="GTK"/>,
+    <para role="optional"><!-- <xref linkend="GTK"/>, -->
     <xref linkend="NASM"/>,
     <ulink url="http://www.mega-nerd.com/libsndfile/">libsndfile</ulink>
Index: multimedia/libdriv/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa-tools.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ multimedia/libdriv/alsa-tools.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -64,5 +64,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><!-- <xref linkend="pkgconfig"/> and -->
-    <xref linkend="gtk2"/> or <xref linkend="GTK"/>
+    <xref linkend="gtk2"/> <!-- or <xref linkend="GTK"/> -->
     (to build <command>echomixer</command>,
     <command>envy24control</command> and <command>rmedigicontrol</command>),
Index: multimedia/libdriv/faad2.xml
===================================================================
--- multimedia/libdriv/faad2.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ multimedia/libdriv/faad2.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -65,4 +65,5 @@
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">FAAD2 Dependencies</bridgehead>
 
@@ -70,5 +71,5 @@
     <para role="optional"><xref linkend="xmms"/> and
     <ulink url="http://mpeg4ip.sourceforge.net/">mpeg4ip</ulink> (both
-    are untested, and both projects are dead).</para>
+    are untested, and both projects are dead).</para> -->
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ multimedia/libdriv/flac.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -70,5 +70,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libogg"/>,
-    <xref linkend="xmms"/>,
+    <!-- <xref linkend="xmms"/>, -->
     <xref linkend="NASM"/>,
     <xref linkend="docbook-utils"/>,
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ multimedia/libdriv/libdv.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -62,5 +62,5 @@
     <!-- <xref linkend="pkgconfig"/>, -->
     <xref linkend="sdl"/>,
-    <xref linkend="GTK"/>, and
+    <!-- <xref linkend="GTK"/>, -->and
     <xref linkend="x-window-system"/></para>
 
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ multimedia/videoutils/mplayer.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -183,7 +183,7 @@
 <!--    <xref linkend="nas"/>, -->
     <ulink url="http://openal.org/">OpenAL</ulink>,
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>,
-    <xref linkend="sdl"/> (also used for video output), and
-    <xref linkend="xmms"/></para>
+    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>, and 
+    <xref linkend="sdl"/> (also used for video output)<!--, and
+    <xref linkend="xmms"/>--></para>
 
     <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
@@ -196,6 +196,6 @@
     <ulink url="http://www.ggi-project.org/">GGI</ulink>,
     <xref linkend="giflib"/>,
-    <xref linkend="gtk2"/> or
-    <xref linkend="GTK"/>,
+    <xref linkend="gtk2"/> <!-- or
+    <xref linkend="GTK"/>, -->
     <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
     <xref linkend="libjpeg"/>,
@@ -314,6 +314,6 @@
 
       <para>To enable building the GUI version of
-      <application>MPlayer</application> (requires <xref linkend="gtk2"/> or
-      <xref linkend="GTK"/>), add <option>--enable-gui</option> to the
+      <application>MPlayer</application> (requires <xref linkend="gtk2"/><!-- or
+      <xref linkend="GTK"/>-->), add <option>--enable-gui</option> to the
       <command>configure</command> script. You'll also need to extract at least
       one skin. Extract the desired skin and create the default location (as
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ multimedia/videoutils/transcode.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -100,5 +100,5 @@
     <ulink url="http://mjpeg.sourceforge.net/">MJPEG Tools</ulink>,
     <xref linkend="sdl"/>,
-    <xref linkend="GTK"/>,
+    <!-- <xref linkend="GTK"/>, -->
     <xref linkend="libfame"/>,
     <xref linkend="imagemagick"/>, and
Index: networking/netlibs/gnet.xml
===================================================================
--- networking/netlibs/gnet.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ networking/netlibs/gnet.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -59,5 +59,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GLib"/> or <xref linkend="glib2"/></para>
+    <para role="required"><!--<xref linkend="GLib"/> or--><xref linkend="glib2"/></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: networking/netutils/wireshark.xml
===================================================================
--- networking/netutils/wireshark.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ networking/netutils/wireshark.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -75,5 +75,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GLib"/> or <xref linkend="glib2"/>
+    <para role="required"><!--<xref linkend="GLib"/> or --><xref linkend="glib2"/>
     (to build the TTY-mode front-end only)</para>
 
@@ -88,5 +88,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><!-- <xref linkend="pkgconfig"/>, -->
-    <xref linkend="GTK"/> or <xref linkend="gtk2"/> (to build the GUI front-end),
+    <xref linkend="gtk2"/> (to build the GUI front-end),
     <xref linkend="openssl"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ postlfs/editors/vim.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -83,11 +83,12 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk2"/> or
-    <xref linkend="lesstif"/> or
-    <xref linkend="GTK"/>,
-    <xref linkend="python"/>,
-    <xref linkend="tcl"/>,
-    <xref linkend="ruby"/>, and
-    <xref linkend="gpm"/></para>
+    <para role="optional">
+      <xref linkend="gtk2"/> or
+      <xref linkend="lesstif"/>
+      <xref linkend="python"/>,
+      <xref linkend="tcl"/>,
+      <xref linkend="ruby"/>, and
+      <xref linkend="gpm"/>
+    </para>
     <!-- mentioned below as a runtime dependency
     <xref linkend="rsync"/> (to update the runtime files)
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ pst/printing/gs.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -243,5 +243,5 @@
     <note>
       <para>The shared library depends on <xref linkend="gtk2"/>. It is
-      only used in external programs like <xref linkend="gsview"/> and
+      only used in external programs like <!-- <xref linkend="gsview"/> and -->
       <xref linkend="imagemagick"/>.</para>
     </note>
Index: pst/ps/ps.xml
===================================================================
--- pst/ps/ps.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ pst/ps/ps.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -23,5 +23,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enscript.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsview.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsview.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xpdf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epdfview.xml"/>
Index: pst/scanning/xsane.xml
===================================================================
--- pst/scanning/xsane.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ pst/scanning/xsane.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -59,6 +59,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/> or <xref linkend="GTK"/> and
-    <xref linkend="sane"/> (back ends)</para>
+    <para role="required">
+      <xref linkend="gtk2"/> and <xref linkend="sane"/> (back ends)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision fbb93edd526f122f08873835e7aa4bcbbe32bae5)
+++ x/lib/lib.xml	(revision 3b10fa875d5af225fc88648c6ea44ed7177f26c9)
@@ -27,5 +27,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm.xml"/>
