Author: ken
Date: 2012-01-25 12:26:52 -0700 (Wed, 25 Jan 2012)
New Revision: 9210

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/python-modules.xml
   trunk/BOOK/general/sysutils/dbus-bindings.xml
   trunk/BOOK/gnome/add/alacarte.xml
   trunk/BOOK/gnome/add/deskbar-applet.xml
   trunk/BOOK/gnome/add/gnome-mag.xml
   trunk/BOOK/gnome/add/hamster-applet.xml
   trunk/BOOK/gnome/add/orca.xml
   trunk/BOOK/gnome/add/totem.xml
   trunk/BOOK/gnome/core/gnome-applets.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/farsight2.xml
Log:
Merging Wayne's python-modules changes : done by hand, but looks ok to me.

Modified: trunk/BOOK/general/prog/python-modules.xml
===================================================================
--- trunk/BOOK/general/prog/python-modules.xml  2012-01-25 04:08:06 UTC (rev 
9209)
+++ trunk/BOOK/general/prog/python-modules.xml  2012-01-25 19:26:52 UTC (rev 
9210)
@@ -25,13 +25,20 @@
   <!ENTITY py2cairo-buildsize     "3.6 MB">
   <!ENTITY py2cairo-time          "less than 0.1 SBU">
 
-  <!ENTITY pygobject-download-http 
"&gnome-download-http;/pygobject/3.0/pygobject-&pygobject-version;.tar.xz">
-  <!ENTITY pygobject-download-ftp  
"&gnome-download-ftp;/pygobject/3.0/pygobject-&pygobject-version;.tar.xz">
-  <!ENTITY pygobject-md5sum        "d17e2565e139d647e8ee50fd1126aa9e">
-  <!ENTITY pygobject-size          "540 KB">
-  <!ENTITY pygobject-buildsize     "16 MB">
-  <!ENTITY pygobject-time          "0.2 SBU">
+  <!ENTITY pygobject2-download-http 
"&gnome-download-http;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
+  <!ENTITY pygobject2-download-ftp  
"&gnome-download-ftp;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
+  <!ENTITY pygobject2-md5sum        "9415cb7f2b3a847f2310ccea258b101e">
+  <!ENTITY pygobject2-size          "730 KB">
+  <!ENTITY pygobject2-buildsize     "25 MB">
+  <!ENTITY pygobject2-time          "0.2 SBU">
 
+  <!ENTITY pygobject3-download-http 
"&gnome-download-http;/pygobject/3.0/pygobject-&pygobject3-version;.tar.xz">
+  <!ENTITY pygobject3-download-ftp  
"&gnome-download-ftp;/pygobject/3.0/pygobject-&pygobject3-version;.tar.xz">
+  <!ENTITY pygobject3-md5sum        "d17e2565e139d647e8ee50fd1126aa9e">
+  <!ENTITY pygobject3-size          "540 KB">
+  <!ENTITY pygobject3-buildsize     "16 MB">
+  <!ENTITY pygobject3-time          "0.2 SBU">
+
   <!ENTITY pygtk-download-http 
"&gnome-download-http;/pygtk/2.17/pygtk-&pygtk-version;.tar.bz2">
   <!ENTITY pygtk-download-ftp  
"&gnome-download-ftp;/pygtk/2.17/pygtk-&pygtk-version;.tar.bz2">
   <!ENTITY pygtk-md5sum        "43d704343d7ca04a6e4ddd4fa73a3c55">
@@ -46,7 +53,7 @@
   <!ENTITY pygtksourceview-buildsize     "5 MB">
   <!ENTITY pygtksourceview-time          "0.4 SBU">
 
-
+  <!--
   <!ENTITY pyorbit-download-http 
"&gnome-download-http;/pyorbit/2.24/pyorbit-&pyorbit-version;.tar.bz2">
   <!ENTITY pyorbit-download-ftp  
"&gnome-download-ftp;/pyorbit/2.24/pyorbit-&pyorbit-version;.tar.bz2">
   <!ENTITY pyorbit-md5sum        "574593815e75ee6e98062c75d6d1581f">
@@ -66,7 +73,7 @@
   <!ENTITY gnome-python-desktop-md5sum        
"b90f6e96a6321e7bf859f6faff2aa4df">
   <!ENTITY gnome-python-desktop-size          "584 KB">
   <!ENTITY gnome-python-desktop-buildsize     "15 MB">
-  <!ENTITY gnome-python-desktop-time          "0.3 SBU">
+  <!ENTITY gnome-python-desktop-time          "0.3 SBU"> -->
 ]>
 
 <sect1 id="python-modules" xreflabel="Python modules">
@@ -103,15 +110,18 @@
         <para><xref linkend="pycairo"/></para>
       </listitem>
       <listitem>
-        <para><xref linkend="pygobject"/></para>
+        <para><xref linkend="pygobject2"/></para>
       </listitem>
       <listitem>
+        <para><xref linkend="pygobject3"/></para>
+      </listitem>
+      <listitem>
         <para><xref linkend="pygtk"/></para>
       </listitem>
       <listitem>
         <para><xref linkend="pygtksourceview"/></para>
       </listitem>
-      <listitem>
+      <!--<listitem>
         <para><xref linkend="pyorbit"/></para>
       </listitem>
       <listitem>
@@ -119,7 +129,7 @@
       </listitem>
       <listitem>
         <para><xref linkend="gnome-python-desktop"/></para>
-      </listitem>
+      </listitem>-->
     </itemizedlist>
 
   </sect2>
@@ -445,12 +455,12 @@
 
   <!-- End Pycairo -->
 
-  <!-- Begin PyGObject -->
-  <sect2 id="pygobject" xreflabel="PyGObject-&pygobject-version;">
+  <!-- Begin PyGObject2 -->
+  <sect2 id="pygobject2" xreflabel="PyGObject-&pygobject2-version;">
 
-    <title>PyGObject-&pygobject-version;</title>
+    <title>PyGObject-&pygobject2-version;</title>
 
-    <indexterm zone="pygobject">
+    <indexterm zone="pygobject2">
       <primary sortas="a-PyGObject">PyGObject</primary>
     </indexterm>
 
@@ -460,27 +470,138 @@
       <para>PyGObject provides <application>Python</application> bindings to 
the
       GObject class from <application>GLib</application>.</para>
 
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>Download (HTTP): <ulink 
url="&pygobject2-download-http;"/></para>
+        </listitem>
+        <listitem>
+          <para>Download (FTP): <ulink url="&pygobject2-download-ftp;"/></para>
+        </listitem>
+        <listitem>
+          <para>Download MD5 sum: &pygobject2-md5sum;</para>
+        </listitem>
+        <listitem>
+          <para>Download size: &pygobject2-size;</para>
+        </listitem>
+        <listitem>
+          <para>Estimated disk space required: &pygobject2-buildsize;</para>
+        </listitem>
+        <listitem>
+          <para>Estimated build time: &pygobject2-time;</para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyGObject Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required"><xref linkend="pycairo"/> and
+      <xref linkend="glib2"/></para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional"><xref linkend="gobject-introspection"/> and
+      <xref linkend="libxslt"/> (to Build Documentation)</para>
+
+      <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/pygobject"/></para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyGObject</title>
+
+      <para>Install <application>PyGObject</application> by running the 
following
+      commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --disable-introspection &amp;&amp;
+make</userinput></screen>
+
+      <!-- not strictly true, blows up with
+      No rule to make target `Regress-1.0.typelib', needed by `check-local' -->
+      <para>This package does not have a testsuite.</para>
+      <!-- <para>To test the results, issue: <command>make 
check</command>.</para> -->
+
+      <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para><parameter>--disable-introspection</parameter>: This switch is
+      required because the package cannot build against recent versions of
+      <application>gobject-introspection</application>.</para>
+
+      <para><option>--disable-docs</option>: This option disables the
+      rebuilding of the html documentation if <xref linkend="libxslt"/> is
+      installed.</para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>pygobject-codegen-2.0</seg>
+          <seg>libpyglib-2.0-python.so, _gio.so, unix.so, _glib.so, and
+          _gobject.so</seg>
+          <seg>/usr/{include/pygtk-2.0,
+          
lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
+          share/{gtk-doc/html/pygobject,pygobject/{2.0/{codegen,defs},
+          xsl}}}</seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+
+  <!-- End PyGObject2 -->
+
+  <!-- Begin PyGObject3 -->
+  <sect2 id="pygobject3" xreflabel="PyGObject-&pygobject3-version;">
+
+    <title>PyGObject-&pygobject3-version;</title>
+
+    <indexterm zone="pygobject3">
+      <primary sortas="a-PyGObject">PyGObject</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyGObject Module</title>
+
+      <para>PyGObject provides <application>Python</application> bindings to 
the
+      GObject class from <application>GLib</application>.</para>
+
       &lfs70_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink 
url="&pygobject-download-http;"/></para>
+          <para>Download (HTTP): <ulink 
url="&pygobject3-download-http;"/></para>
         </listitem>
         <listitem>
-          <para>Download (FTP): <ulink url="&pygobject-download-ftp;"/></para>
+          <para>Download (FTP): <ulink url="&pygobject3-download-ftp;"/></para>
         </listitem>
         <listitem>
-          <para>Download MD5 sum: &pygobject-md5sum;</para>
+          <para>Download MD5 sum: &pygobject3-md5sum;</para>
         </listitem>
         <listitem>
-          <para>Download size: &pygobject-size;</para>
+          <para>Download size: &pygobject3-size;</para>
         </listitem>
         <listitem>
-          <para>Estimated disk space required: &pygobject-buildsize;</para>
+          <para>Estimated disk space required: &pygobject3-buildsize;</para>
         </listitem>
         <listitem>
-          <para>Estimated build time: &pygobject-time;</para>
+          <para>Estimated build time: &pygobject3-time;</para>
         </listitem>
       </itemizedlist>
 
@@ -503,6 +624,8 @@
 
     </sect3>
 
+  <!-- Begin PyGObject -->
+
     <sect3 role="installation">
       <title>Installation of PyGObject</title>
 
@@ -598,7 +721,7 @@
       <bridgehead renderas="sect4">PyGTK Dependencies</bridgehead>
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="pygobject"/></para>
+      <para role="required"><xref linkend="pygobject2"/></para>
 
       <bridgehead renderas="sect5">Required (atk module)</bridgehead>
       <para role="required"><xref linkend="atk"/></para>
@@ -828,7 +951,8 @@
   </sect2>
   <!-- End PyGtkSourceView -->
 
-  <!-- Begin PyORBit -->
+  <!--
+  <!\-\- Begin PyORBit \-\->
   <sect2 id="pyorbit" xreflabel="PyORBit-&pyorbit-version;">
 
     <title>PyORBit-&pyorbit-version;</title>
@@ -882,10 +1006,10 @@
       <para>Install <application>PyORBit</application> by running the following
       commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure \-\-prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-      <!-- There's some test scripts, but I don't know what to run -->
+      <!\-\- There's some test scripts, but I don't know what to run \-\->
       <para>This package does not come with a test suite.</para>
 
       <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
@@ -912,9 +1036,9 @@
     </sect3>
 
   </sect2>
-  <!-- End PyORBit -->
+  <!\-\- End PyORBit \-\->
 
-  <!-- Begin Gnome-Python -->
+  <!\-\- Begin Gnome-Python \-\->
   <sect2 id="gnome-python" xreflabel="Gnome-Python-&gnome-python-version;">
 
     <title>Gnome-Python-&gnome-python-version;</title>
@@ -957,8 +1081,8 @@
       <para role="required"><xref linkend="pygtk"/> and
       <xref linkend="libgnome"/></para>
 
-      <!-- Many modules get their deps pulled in through libgnome: libbonobo,
-           gnome-vfs, GConf -->
+      <!\-\- Many modules get their deps pulled in through libgnome: libbonobo,
+           gnome-vfs, GConf \-\->
 
       <bridgehead renderas="sect5">Required (gnome.ui module)</bridgehead>
       <para role="required"><xref linkend="pyorbit"/> and
@@ -985,10 +1109,10 @@
       <para>Install <application>Gnome-Python</application> by running the 
following
       commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure \-\-prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-      <!-- Tests were crashing on me; need to figure out why -->
+      <!\-\- Tests were crashing on me; need to figure out why \-\->
       <para>This package does not come with a test suite.</para>
 
       <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
@@ -1019,9 +1143,9 @@
     </sect3>
 
   </sect2>
-  <!-- End Gnome-Python -->
+  <!\-\- End Gnome-Python \-\->
 
-  <!-- Begin Gnome-Python-Desktop -->
+  <!\-\- Begin Gnome-Python-Desktop \-\->
   <sect2 id="gnome-python-desktop" 
xreflabel="Gnome-Python-Desktop-&gnome-python-desktop-version;">
 
     <title>Gnome-Python-Desktop-&gnome-python-desktop-version;</title>
@@ -1060,8 +1184,8 @@
 
       <bridgehead renderas="sect4">Gnome-Python-Desktop 
Dependencies</bridgehead>
 
-      <!-- Not strictly true, but needed to find install directories and
-           by most modules -->
+      <!\-\- Not strictly true, but needed to find install directories and
+           by most modules \-\->
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required"><xref linkend="gnome-python"/></para>
 
@@ -1074,7 +1198,7 @@
       <bridgehead renderas="sect5">Required (gnomeprint.ui module)</bridgehead>
       <para role="required"><xref linkend="libgnomeprintui"/></para>
 
-      <!-- looks like version 1.x of gtksourceview is the requirement -->
+      <!\-\- looks like version 1.x of gtksourceview is the requirement \-\->
       <bridgehead renderas="sect5">Required (gtksourceview module)</bridgehead>
       <para role="required"><xref linkend="gtksourceview"/> (Version 1.x 
required)</para>
 
@@ -1125,10 +1249,10 @@
       <para>Install <application>Gnome-Python-Desktop</application> by running
       the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure \-\-prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-      <!-- Tests were crashing on me; need to figure out why -->
+      <!\-\- Tests were crashing on me; need to figure out why \-\->
       <para>This package does not come with a test suite.</para>
 
       <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
@@ -1140,7 +1264,7 @@
     <sect3 role="commands">
       <title>Command Explanations</title>
 
-      <para><parameter>--enable-metacity</parameter>: This option enables
+      <para><parameter>\-\-enable-metacity</parameter>: This option enables
       building the metacity module if <xref linkend="metacity"/> is
       installed.</para>
 
@@ -1168,6 +1292,6 @@
     </sect3>
 
   </sect2>
-  <!-- End Gnome-Python-Desktop -->
+  <!\-\- End Gnome-Python-Desktop -->
 
 </sect1>

Modified: trunk/BOOK/general/sysutils/dbus-bindings.xml
===================================================================
--- trunk/BOOK/general/sysutils/dbus-bindings.xml       2012-01-25 04:08:06 UTC 
(rev 9209)
+++ trunk/BOOK/general/sysutils/dbus-bindings.xml       2012-01-25 19:26:52 UTC 
(rev 9210)
@@ -264,7 +264,7 @@
 
       <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
-        <xref linkend="pygobject"/> (required to run the test suite)
+        <xref linkend="pygobject2"/> (required to run the test suite)
       </para>
 
       <bridgehead renderas="sect5">Optional

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-01-25 04:08:06 UTC (rev 9209)
+++ trunk/BOOK/general.ent      2012-01-25 19:26:52 UTC (rev 9210)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "25">                   <!-- Always 2 digits -->
+<!ENTITY day          "26">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 25th, &year;">
+<!ENTITY releasedate  "January 26th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -417,12 +417,14 @@
 <!ENTITY pyxml-version                "0.8.4">
 <!ENTITY pycairo-version              "1.8.8">
 <!ENTITY py2cairo-version             "1.10.0">
-<!ENTITY pygobject-version            "3.0.3">
+<!ENTITY pygobject2-version           "2.28.6">
+<!ENTITY pygobject3-version           "3.0.3">
 <!ENTITY pygtk-version                "2.17.0">
 <!ENTITY pygtksourceview-version      "2.10.1">
+<!--- Obsolete
 <!ENTITY pyorbit-version              "2.24.0">
 <!ENTITY gnome-python-version         "2.28.1">
-<!ENTITY gnome-python-desktop-version "2.30.2">
+<!ENTITY gnome-python-desktop-version "2.30.2">-->
 
 <!-- Part IV -->
 <!-- Chapter 13 -->

Modified: trunk/BOOK/gnome/add/alacarte.xml
===================================================================
--- trunk/BOOK/gnome/add/alacarte.xml   2012-01-25 04:08:06 UTC (rev 9209)
+++ trunk/BOOK/gnome/add/alacarte.xml   2012-01-25 19:26:52 UTC (rev 9210)
@@ -60,7 +60,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="gnome-menus"/> and
-    <xref linkend="pygobject"/></para>
+    <xref linkend="pygobject2"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/alacarte"/></para>

Modified: trunk/BOOK/gnome/add/deskbar-applet.xml
===================================================================
--- trunk/BOOK/gnome/add/deskbar-applet.xml     2012-01-25 04:08:06 UTC (rev 
9209)
+++ trunk/BOOK/gnome/add/deskbar-applet.xml     2012-01-25 19:26:52 UTC (rev 
9210)
@@ -61,7 +61,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="dbus-python"/>,
     <xref linkend="gnome-desktop"/>, and
+    <!-- FIXME:ken -->
+    Gnome-Python-Desktop-2.30.2</para>
+    <!--
     <xref linkend="gnome-python-desktop"/></para>
+    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="evolution-data-server"/> and

Modified: trunk/BOOK/gnome/add/gnome-mag.xml
===================================================================
--- trunk/BOOK/gnome/add/gnome-mag.xml  2012-01-25 04:08:06 UTC (rev 9209)
+++ trunk/BOOK/gnome/add/gnome-mag.xml  2012-01-25 19:26:52 UTC (rev 9210)
@@ -67,10 +67,13 @@
     <para role="optional"><xref linkend="gnome-desktop"/>,
     <ulink url="http://people.debian.org/~ruoso/";>colorblind</ulink>,
     <xref linkend="pygtk"/> (including the gtk and gtk.libglade modules),
+    <!-- FIXME:ken --> PYORBit-2.24.0, Gnome-Python-2.28.1, 
Gnome-Python-Desktop-2.30.2.</para>
+   <!--
     <xref linkend="pyorbit"/>,
     <xref linkend="gnome-python"/> (including the gnome.ui module), and
     <xref linkend="gnome-python-desktop"/> (including the gnomeapplet
     module)</para>
+    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="doxygen"/></para>

Modified: trunk/BOOK/gnome/add/hamster-applet.xml
===================================================================
--- trunk/BOOK/gnome/add/hamster-applet.xml     2012-01-25 04:08:06 UTC (rev 
9209)
+++ trunk/BOOK/gnome/add/hamster-applet.xml     2012-01-25 19:26:52 UTC (rev 
9210)
@@ -61,7 +61,11 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="python"/> with <xref 
linkend="sqlite"/>
+    <!-- FIXME:ken -->
+    and Gnome-Python-Desktop-2.30.2 (gnomeapplet module only)</para>
+    <!--
     and <xref linkend="gnome-python-desktop"/> (gnomeapplet module only)</para>
+    -->
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/hamster-applet"/></para>

Modified: trunk/BOOK/gnome/add/orca.xml
===================================================================
--- trunk/BOOK/gnome/add/orca.xml       2012-01-25 04:08:06 UTC (rev 9209)
+++ trunk/BOOK/gnome/add/orca.xml       2012-01-25 19:26:52 UTC (rev 9210)
@@ -63,8 +63,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="at-spi"/>,
     <xref linkend="dbus-python"/>, and
+    <!-- FIXME:ken 1 --> Gnome-Python-2.28.1 (with PyORBit-2.24.0)</para>
+    <!--
     <xref linkend="gnome-python"/> (with
     <xref linkend="pyorbit"/>)</para>
+    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><ulink
@@ -75,8 +78,13 @@
     <ulink url="http://code.google.com/p/liblouis/";>liblouis</ulink> (required
     for contracted braille),
     <xref linkend="gnome-mag"/> (required for screen magnification),
+    <!-- FIXME:ken 2 -->
+    Gnome-Python-Desktop-2.30.2 (wnck module required for mouse
+    review),
+    <!--
     <xref linkend="gnome-python-desktop"/> (wnck module required for mouse
     review),
+    -->
     <xref linkend="gnome-speech"/> (required for speech-enabled screen
     reading)</para>
 

Modified: trunk/BOOK/gnome/add/totem.xml
===================================================================
--- trunk/BOOK/gnome/add/totem.xml      2012-01-25 04:08:06 UTC (rev 9209)
+++ trunk/BOOK/gnome/add/totem.xml      2012-01-25 19:26:52 UTC (rev 9210)
@@ -89,7 +89,7 @@
     <ulink url="http://live.gnome.org/libgdata/";>libgdata</ulink>,
     <ulink url="http://www.lirc.org";>LIRC</ulink>,
     <xref linkend="nautilus"/>,
-    <xref linkend="pygobject"/>,
+    <xref linkend="pygobject2"/>,
     <ulink url="http://live.gnome.org/Tracker/";>Tracker</ulink>,
     <ulink url="http://live.gnome.org/Vala/";>Vala</ulink>, and
     <xref linkend="xulrunner"/>

Modified: trunk/BOOK/gnome/core/gnome-applets.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-applets.xml     2012-01-25 04:08:06 UTC (rev 
9209)
+++ trunk/BOOK/gnome/core/gnome-applets.xml     2012-01-25 19:26:52 UTC (rev 
9210)
@@ -65,8 +65,13 @@
 
     <bridgehead renderas="sect4">Optional to Build the Invest 
Applet</bridgehead>
     <para role="optional"><xref linkend="pygtk"/> (including the gtk and
+    <!-- FIXME:ken -->
+    gtk.libglade modules) and Gnome-Python-Desktop-2.30.2
+    (including the gnomeapplet module)</para>
+    <!--
     gtk.libglade modules) and <xref linkend="gnome-python-desktop"/>
     (including the gnomeapplet module)</para>
+    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="rarian"/>,

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2012-01-25 04:08:06 UTC 
(rev 9209)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2012-01-25 19:26:52 UTC 
(rev 9210)
@@ -42,6 +42,17 @@
 
 -->
     <listitem>
+      <para>January 26th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Merge Wayne's python module changes: pygobject2
+          (2.28.6) reinstated alongside pygobject3; pyorbit, gnome-python
+          and gnome-python-desktop retired.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 25th, 2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/multimedia/libdriv/farsight2.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/farsight2.xml 2012-01-25 04:08:06 UTC (rev 
9209)
+++ trunk/BOOK/multimedia/libdriv/farsight2.xml 2012-01-25 19:26:52 UTC (rev 
9210)
@@ -68,7 +68,7 @@
     url="http://gstreamer.freedesktop.org/modules/gst-python.html";>GStreamer
     Python Bindings</ulink>,
     <xref linkend="gtk-doc"/>,
-    <xref linkend="pygobject"/>, and
+    <xref linkend="pygobject2"/>, and
     <ulink url="http://www.valgrind.org/";>Valgrind</ulink></para>
 
     <para condition="html" role="usernotes">User Notes:

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to