r5634 - trunk/BOOK/gnome/core

randy at linuxfromscratch.org randy at linuxfromscratch.org
Thu Feb 2 22:09:26 PST 2006


Author: randy
Date: 2006-02-02 23:09:24 -0700 (Thu, 02 Feb 2006)
New Revision: 5634

Modified:
   trunk/BOOK/gnome/core/control-center.xml
   trunk/BOOK/gnome/core/eel.xml
   trunk/BOOK/gnome/core/gail.xml
   trunk/BOOK/gnome/core/gconf.xml
   trunk/BOOK/gnome/core/gtk-engines.xml
   trunk/BOOK/gnome/core/libbonobo.xml
   trunk/BOOK/gnome/core/libbonoboui.xml
   trunk/BOOK/gnome/core/libgnome.xml
   trunk/BOOK/gnome/core/libgnomecanvas.xml
   trunk/BOOK/gnome/core/libgnomeui.xml
   trunk/BOOK/gnome/core/libgtop.xml
   trunk/BOOK/gnome/core/nautilus.xml
   trunk/BOOK/gnome/core/orbit2.xml
   trunk/BOOK/gnome/core/pre-install-config.xml
   trunk/BOOK/gnome/core/scrollkeeper.xml
   trunk/BOOK/gnome/core/vte.xml
   trunk/BOOK/gnome/core/yelp.xml
Log:
Update GNOME Core packages to the 2.12.2 version - Commit #2

Modified: trunk/BOOK/gnome/core/control-center.xml
===================================================================
--- trunk/BOOK/gnome/core/control-center.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/control-center.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY control-center-download-http "http://ftp.gnome.org/pub/GNOME/sources/control-center/&gnome-version;/control-center-&control-center-version;.tar.bz2">
-  <!ENTITY control-center-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/control-center/&gnome-version;/control-center-&control-center-version;.tar.bz2">
+  <!ENTITY control-center-download-http "&gnome-download-http;/control-center/&gnome-version;/control-center-&control-center-version;.tar.bz2">
+  <!ENTITY control-center-download-ftp  "&gnome-download-ftp;/control-center/&gnome-version;/control-center-&control-center-version;.tar.bz2">
   <!ENTITY control-center-md5sum        "f3d8520b8544e1f910600ba889e02523">
   <!ENTITY control-center-size          "1.7 MB">
   <!ENTITY control-center-buildsize     "57.3 MB">
@@ -63,13 +63,13 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libxklavier"/>,
     <xref linkend="metacity"/>,
-    <xref linkend="gnome-icon-theme"/> and
+    <xref linkend="gnome-icon-theme"/>, and
     <xref linkend="nautilus"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="evolution-data-server"/>,
     <xref linkend="alsa"/>,
-    <xref linkend="gst-plugins"/> and
+    <xref linkend="gst-plugins"/>, and
     <xref linkend="xscreensaver"/></para>
 
   </sect2>
@@ -81,8 +81,10 @@
     following commands:</para>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --localstatedir=/var/lib --sysconfdir=/etc/gnome &&
+    --libexecdir=`pkg-config \
+    --variable=prefix ORBit-2.0`/lib/control-center \
+    --localstatedir=/var/lib \
+    --sysconfdir=&gnome-etc-dir; &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -97,8 +99,9 @@
     <title>Command Explanations</title>
 
     <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
-    <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+    ORBit-2.0`/lib/control-center</parameter>: This switch puts libexec files in
+    <filename class="directory">$GNOME_PREFIX/lib/control-center</filename>
+    instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
     <para><parameter>--localstatedir=/var/lib</parameter>: This switch
@@ -106,8 +109,8 @@
     <filename class="directory">/var/lib/scrollkeeper</filename> instead of
     <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-    puts configuration files in <filename class="directory">/etc/gnome</filename>
+    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
+    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
     <para><option>--enable-aboutme</option>: Enables building the
@@ -139,7 +142,7 @@
         modules and <application>Nautilus</application> library module
         extensions</seg>
         <seg>several config directories under the
-        /etc/gnome/gconf/gconf.xml.defaults/ hierarchy,
+        &gnome-etc-dir;/gconf/gconf.xml.defaults/ hierarchy,
         $GNOME_PREFIX/include/gnome-window-settings-2.0,
         $GNOME_PREFIX/lib/[nautilus,window-manager-settings],
         $GNOME_PREFIX/share/control-center-2.0, and

Modified: trunk/BOOK/gnome/core/eel.xml
===================================================================
--- trunk/BOOK/gnome/core/eel.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/eel.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY eel-download-http "http://ftp.gnome.org/pub/GNOME/sources/eel/&gnome-version;/eel-&eel-version;.tar.bz2">
-  <!ENTITY eel-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/eel/&gnome-version;/eel-&eel-version;.tar.bz2">
-  <!ENTITY eel-md5sum        "08281630bef2e2f957ec2c349d73d112">
+  <!ENTITY eel-download-http "&gnome-download-http;/eel/&gnome-version;/eel-&eel-version;.tar.bz2">
+  <!ENTITY eel-download-ftp  "&gnome-download-ftp;/eel/&gnome-version;/eel-&eel-version;.tar.bz2">
+  <!ENTITY eel-md5sum        "d78cd3e33c656a62b5bf1f8d0b8d271f">
   <!ENTITY eel-size          "675 KB">
-  <!ENTITY eel-buildsize     "14.0 MB">
+  <!ENTITY eel-buildsize     "13.9 MB">
   <!ENTITY eel-time          "0.5 SBU">
 ]>
 
@@ -63,7 +63,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="gnome-desktop"/>,
-    <xref linkend="gnome-menus"/> and
+    <xref linkend="gnome-menus"/>, and
     <xref linkend="gail"/></para>
 
   </sect2>

Modified: trunk/BOOK/gnome/core/gail.xml
===================================================================
--- trunk/BOOK/gnome/core/gail.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/gail.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gail-download-http "http://ftp.gnome.org/pub/GNOME/sources/gail/1.8/gail-&gail-version;.tar.bz2">
-  <!ENTITY gail-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gail/1.8/gail-&gail-version;.tar.bz2">
-  <!ENTITY gail-md5sum        "7587a0a9ee643bb59ef6b2dea06c5a28">
-  <!ENTITY gail-size          "563 KB">
-  <!ENTITY gail-buildsize     "19.3 MB">
+  <!ENTITY gail-download-http "&gnome-download-http;/gail/1.8/gail-&gail-version;.tar.bz2">
+  <!ENTITY gail-download-ftp  "&gnome-download-ftp;/gail/1.8/gail-&gail-version;.tar.bz2">
+  <!ENTITY gail-md5sum        "9fd96f8f702b46c328329468632c0729">
+  <!ENTITY gail-size          "582 KB">
+  <!ENTITY gail-buildsize     "20.2 MB">
   <!ENTITY gail-time          "0.6 SBU">
 ]>
 

Modified: trunk/BOOK/gnome/core/gconf.xml
===================================================================
--- trunk/BOOK/gnome/core/gconf.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/gconf.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY GConf-download-http "http://ftp.gnome.org/pub/GNOME/sources/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
-  <!ENTITY GConf-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
+  <!ENTITY GConf-download-http "&gnome-download-http;/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
+  <!ENTITY GConf-download-ftp  "&gnome-download-http;/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
   <!ENTITY GConf-md5sum        "247110de013ed24b17cf4191eb6daec5">
   <!ENTITY GConf-size          "1.9 MB">
-  <!ENTITY GConf-buildsize     "26.0 MB">
+  <!ENTITY GConf-buildsize     "28.9 MB">
   <!ENTITY GConf-time          "0.4 SBU">
 ]>
 
@@ -67,7 +67,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk2"/>,
     <xref linkend="openldap"/>,
-    <xref linkend="gtk-doc"/> and
+    <xref linkend="gtk-doc"/>, and
     <xref linkend="docbook-utils"/></para>
 
   </sect2>
@@ -80,7 +80,7 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/lib/GConf \
-    --sysconfdir=/etc/gnome &&
+    --sysconfdir=&gnome-etc-dir; &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -100,9 +100,9 @@
     <filename class="directory">$GNOME_PREFIX/lib/GConf</filename> instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
+    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch
     puts <application>GConf-2</application> configuration files
-    in <filename class="directory">/etc/gnome</filename> instead of
+    in <filename class="directory">&gnome-etc-dir;</filename> instead of
     <filename class="directory">$GNOME_PREFIX/etc</filename>.  This
     installation controls all future installations of schemas. If you
     change the location (which includes eliminating this parameter), it
@@ -123,7 +123,7 @@
       <seglistitem>
         <seg>gconf-merge-tree and gconftool-2</seg>
         <seg>libgconf-2.[so,a]</seg>
-        <seg>/etc/gnome/gconf,
+        <seg>&gnome-etc-dir;/gconf,
         $GNOME_PREFIX/include/gconf,
         $GNOME_PREFIX/lib/GConf,
         $GNOME_PREFIX/share/gtk-doc/html/gconf,

Modified: trunk/BOOK/gnome/core/gtk-engines.xml
===================================================================
--- trunk/BOOK/gnome/core/gtk-engines.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/gtk-engines.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,10 +4,10 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gtk-engines-download-http "http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-&gtk-engines-version;.tar.bz2">
-  <!ENTITY gtk-engines-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-&gtk-engines-version;.tar.bz2">
-  <!ENTITY gtk-engines-md5sum        "28469a797ba1e6aaa3f7eea4c9f5f9b7">
-  <!ENTITY gtk-engines-size          "477 KB">
+  <!ENTITY gtk-engines-download-http "&gnome-download-http;/gtk-engines/2.6/gtk-engines-&gtk-engines-version;.tar.bz2">
+  <!ENTITY gtk-engines-download-ftp  "&gnome-download-http;/gtk-engines/2.6/gtk-engines-&gtk-engines-version;.tar.bz2">
+  <!ENTITY gtk-engines-md5sum        "218417d5eb6fd4cfda49d6a65041a8a0">
+  <!ENTITY gtk-engines-size          "479 KB">
   <!ENTITY gtk-engines-buildsize     "13.0 MB">
   <!ENTITY gtk-engines-time          "0.4 SBU">
 ]>

Modified: trunk/BOOK/gnome/core/libbonobo.xml
===================================================================
--- trunk/BOOK/gnome/core/libbonobo.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/libbonobo.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libbonobo-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-&libbonobo-version;.tar.bz2">
-  <!ENTITY libbonobo-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-download-http "&gnome-download-http;/libbonobo/2.10/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-download-ftp  "&gnome-download-ftp;/libbonobo/2.10/libbonobo-&libbonobo-version;.tar.bz2">
   <!ENTITY libbonobo-md5sum        "927d572970d87121c8375aab1b4b1d37">
   <!ENTITY libbonobo-size          "1.3 MB">
   <!ENTITY libbonobo-buildsize     "35.3 MB">
@@ -64,12 +64,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="ORBit2"/>,
-    <xref linkend="libxml2"/> and
+    <xref linkend="libxml2"/>, and
     <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)
-    and <xref linkend="gtk-doc"/></para>
+    <para role="optional">X (<xref linkend="xfree86"/> or
+    <xref linkend="xorg"/>) and
+    <xref linkend="gtk-doc"/></para>
 
   </sect2>
 
@@ -80,8 +81,8 @@
     commands:</para>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --sysconfdir=/etc/gnome &&
+    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/lib/bonobo \
+    --sysconfdir=&gnome-etc-dir; &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -101,12 +102,12 @@
     consistent with the installation environment.</para>
 
     <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
-    <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+    ORBit-2.0`/lib/bonobo</parameter>: This switch puts libexec files in
+    <filename class="directory">$GNOME_PREFIX/lib/bonobo</filename> instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
-    configuration files in <filename class="directory">/etc/gnome</filename>
+    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
+    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
     <para><option>--enable-gtk-doc</option>: This switch rebuilds the
@@ -129,7 +130,7 @@
         <seg>libbonobo-2.[so,a], libbonobo-activation.[so,a],
         <application>ORBit-2</application> bonobo module, bonobo
         servers, and libmoniker_std_2.[so,a] bonobo library</seg>
-        <seg>/etc/gnome, $GNOME_PREFIX/include/bonobo-activation-2.0,
+        <seg>&gnome-etc-dir;, $GNOME_PREFIX/include/bonobo-activation-2.0,
         $GNOME_PREFIX/include/libbonobo-2.0,
         $GNOME_PREFIX/lib/bonobo[,2.0],
         $GNOME_PREFIX/share/gtk-doc/html/[bonobo-activation,libbonobo], and

Modified: trunk/BOOK/gnome/core/libbonoboui.xml
===================================================================
--- trunk/BOOK/gnome/core/libbonoboui.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/libbonoboui.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libbonoboui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.10/libbonoboui-&libbonoboui-version;.tar.bz2">
-  <!ENTITY libbonoboui-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.10/libbonoboui-&libbonoboui-version;.tar.bz2">
+  <!ENTITY libbonoboui-download-http "&gnome-download-http;/libbonoboui/2.10/libbonoboui-&libbonoboui-version;.tar.bz2">
+  <!ENTITY libbonoboui-download-ftp  "&gnome-download-ftp;/libbonoboui/2.10/libbonoboui-&libbonoboui-version;.tar.bz2">
   <!ENTITY libbonoboui-md5sum        "74c4b633ae33524e2f6d3e6573b75f3c">
   <!ENTITY libbonoboui-size          "884 KB">
   <!ENTITY libbonoboui-buildsize     "28.7 MB">

Modified: trunk/BOOK/gnome/core/libgnome.xml
===================================================================
--- trunk/BOOK/gnome/core/libgnome.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/libgnome.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libgnome-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
-  <!ENTITY libgnome-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
+  <!ENTITY libgnome-download-http "&gnome-download-http;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
+  <!ENTITY libgnome-download-ftp  "&gnome-download-ftp;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
   <!ENTITY libgnome-md5sum        "f239a7ab132d2ec9039bb2537cca1e92">
   <!ENTITY libgnome-size          "955 KB">
   <!ENTITY libgnome-buildsize     "18.5 MB">
@@ -76,7 +76,7 @@
     commands:</para>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --sysconfdir=/etc/gnome --localstatedir=/var/lib &&
+    --sysconfdir=&gnome-etc-dir; --localstatedir=/var/lib &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -90,8 +90,8 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-    puts configuration files in <filename class="directory">/etc/gnome</filename>
+    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
+    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
     <para><parameter>--localstatedir=/var/lib</parameter>: This
@@ -117,8 +117,8 @@
         <seg>libgnome-2.[so,a] and the libmoniker_extra_2.[so,a] bonobo
         library</seg>
         <seg>several configuration directories under the
-        /etc/gnome/gconf/gconf.xml.defaults/ hierarchy,
-        /etc/gnome/sound,
+        &gnome-etc-dir;/gconf/gconf.xml.defaults/ hierarchy,
+        &gnome-etc-dir;/sound,
         GNOME_PREFIX/include/libgnome-2.0, and
         GNOME_PREFIX/share/gtk-doc/html/libgnome</seg>
       </seglistitem>

Modified: trunk/BOOK/gnome/core/libgnomecanvas.xml
===================================================================
--- trunk/BOOK/gnome/core/libgnomecanvas.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/libgnomecanvas.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libgnomecanvas-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
-  <!ENTITY libgnomecanvas-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
+  <!ENTITY libgnomecanvas-download-http "&gnome-download-http;/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
+  <!ENTITY libgnomecanvas-download-ftp  "&gnome-download-ftp;/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
   <!ENTITY libgnomecanvas-md5sum        "62c0edd3d27803d341662fd9088b2d9b">
   <!ENTITY libgnomecanvas-size          "590 KB">
   <!ENTITY libgnomecanvas-buildsize     "12.4 MB">

Modified: trunk/BOOK/gnome/core/libgnomeui.xml
===================================================================
--- trunk/BOOK/gnome/core/libgnomeui.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/libgnomeui.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libgnomeui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
-  <!ENTITY libgnomeui-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
+  <!ENTITY libgnomeui-download-http "&gnome-download-http;/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
+  <!ENTITY libgnomeui-download-ftp  "&gnome-download-ftp;/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
   <!ENTITY libgnomeui-md5sum        "342a5b8a9d427ff950a71a245a5f4485">
   <!ENTITY libgnomeui-size          "1.8 MB">
   <!ENTITY libgnomeui-buildsize     "39.0 MB">
@@ -65,8 +65,8 @@
     <xref linkend="gnome-keyring"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libjpeg"/>
-    and <xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="libjpeg"/> and
+    <xref linkend="gtk-doc"/></para>
 
   </sect2>
 
@@ -77,7 +77,8 @@
     commands:</para>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin &&
+    --libexecdir=`pkg-config \
+    --variable=prefix ORBit-2.0`/lib/libgnomeui &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -100,12 +101,12 @@
     <title>Command Explanations</title>
 
     <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
-    <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+    ORBit-2.0`/lib/libgnomeui</parameter>: This switch puts libexec files in
+    <filename class="directory">$GNOME_PREFIX/lib/libgnomeui</filename> instead
+    of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
     <para><option>--with-kde-datadir=$KDE_PREFIX/share</option>: Use this
-    parameter if <application>KDE</application> is installed in any prefix
+    parameter if you have <application>KDE</application> installed in any prefix
     other than <filename class='directory'>/usr</filename>.</para>
 
   </sect2>

Modified: trunk/BOOK/gnome/core/libgtop.xml
===================================================================
--- trunk/BOOK/gnome/core/libgtop.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/libgtop.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libgtop-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgtop/&gnome-version;/libgtop-&libgtop-version;.tar.bz2">
-  <!ENTITY libgtop-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/&gnome-version;/libgtop-&libgtop-version;.tar.bz2">
+  <!ENTITY libgtop-download-http "&gnome-download-http;/libgtop/&gnome-version;/libgtop-&libgtop-version;.tar.bz2">
+  <!ENTITY libgtop-download-ftp  "&gnome-download-ftp;/libgtop/&gnome-version;/libgtop-&libgtop-version;.tar.bz2">
   <!ENTITY libgtop-md5sum        "616ed8352f3463855b3eace26b22536e">
   <!ENTITY libgtop-size          "740 KB">
   <!ENTITY libgtop-buildsize     "11.4 MB">
@@ -65,7 +65,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="popt"/>,
-    <xref linkend="gdbm"/> and
+    <xref linkend="gdbm"/>, and
     X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
 
   </sect2>

Modified: trunk/BOOK/gnome/core/nautilus.xml
===================================================================
--- trunk/BOOK/gnome/core/nautilus.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/nautilus.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY nautilus-download-http "http://ftp.gnome.org/pub/GNOME/sources/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
-  <!ENTITY nautilus-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
-  <!ENTITY nautilus-md5sum        "61878b1c3f9bee37cd568e17b31d66b1">
+  <!ENTITY nautilus-download-http "&gnome-download-http;/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
+  <!ENTITY nautilus-download-ftp  "&gnome-download-ftp;/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
+  <!ENTITY nautilus-md5sum        "1c1304e458eda551da11ed8c52b1faa2">
   <!ENTITY nautilus-size          "4.0 MB">
-  <!ENTITY nautilus-buildsize     "85.0 MB">
+  <!ENTITY nautilus-buildsize     "84.9 MB">
   <!ENTITY nautilus-time          "1.0 SBU">
 ]>
 
@@ -62,7 +62,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="eel"/>,
-    <xref linkend="libexif"/> and
+    <xref linkend="libexif"/>, and
     <xref linkend="librsvg"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -78,7 +78,7 @@
     commands:</para>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --sysconfdir=/etc/gnome &&
+    --sysconfdir=&gnome-etc-dir; &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -86,18 +86,18 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&
-install -v -m755 -d \
-    `pkg-config --variable=prefix ORBit-2.0`/share/doc/nautilus-&nautilus-version; &&
-install -v -m644 docs/*.{txt,dia,pdf,sxw,faq,html} \
-    `pkg-config --variable=prefix ORBit-2.0`/share/doc/nautilus-&nautilus-version;</userinput></screen>
+install -v -m755 -d `pkg-config \
+    --variable=prefix ORBit-2.0`/share/doc/nautilus-&nautilus-version; &&
+install -v -m644 docs/*.{txt,dia,pdf,sxw,faq,html} `pkg-config \
+    --variable=prefix ORBit-2.0`/share/doc/nautilus-&nautilus-version;</userinput></screen>
 
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-    puts configuration files in <filename class="directory">/etc/gnome</filename>
+    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
+    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
   </sect2>
@@ -115,7 +115,7 @@
         nautilus-file-management-properties</seg>
         <seg>libnautilus-extension.so, libnautilus-private.so,
         and Nautilus_shell.server bonobo server</seg>
-        <seg>/etc/gnome/gconf/gconf.xml.defaults/[apps,schemas/apps]/nautilus,
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[apps,schemas/apps]/nautilus,
         $GNOME_PREFIX/include/nautilus,
         $GNOME_PREFIX/share/doc/nautilus-2.10.1,
         $GNOME_PREFIX/share/nautilus, and

Modified: trunk/BOOK/gnome/core/orbit2.xml
===================================================================
--- trunk/BOOK/gnome/core/orbit2.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/orbit2.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY ORBit2-download-http "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/&gnome-version;/ORBit2-&ORBit2-version;.tar.bz2">
-  <!ENTITY ORBit2-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/&gnome-version;/ORBit2-&ORBit2-version;.tar.bz2">
+  <!ENTITY ORBit2-download-http "&gnome-download-http;/ORBit2/&gnome-version;/ORBit2-&ORBit2-version;.tar.bz2">
+  <!ENTITY ORBit2-download-ftp  "&gnome-download-ftp;/ORBit2/&gnome-version;/ORBit2-&ORBit2-version;.tar.bz2">
   <!ENTITY ORBit2-md5sum        "aa2cae6e7957c369edccbd98ba78dea9">
   <!ENTITY ORBit2-size          "676 KB">
   <!ENTITY ORBit2-buildsize     "32.3 MB">
@@ -62,10 +62,12 @@
     <bridgehead renderas="sect3">ORBit2 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libidl"/> and <xref linkend="popt"/></para>
+    <para role="required"><xref linkend="libidl"/> and
+    <xref linkend="popt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and <xref linkend="openssl"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/> and
+    <xref linkend="openssl"/></para>
 
   </sect2>
 
@@ -75,7 +77,7 @@
     <para>Install <application>ORBit2</application> by running
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome &&
+<screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=&gnome-etc-dir; &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -95,8 +97,8 @@
     <envar>GNOME_PREFIX</envar> is set for this install or globally to your
     install directory as described in the introduction of this Chapter.</para>
 
-    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
-    configuration files in <filename class="directory">/etc/gnome</filename>
+    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
+    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
     <para><option>--enable-gtk-doc</option>: Use this parameter if you have

Modified: trunk/BOOK/gnome/core/pre-install-config.xml
===================================================================
--- trunk/BOOK/gnome/core/pre-install-config.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/pre-install-config.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -24,7 +24,7 @@
   <para>If you want to try-out <application>GNOME</application>, or install
   it in an easy-to-remove location:</para>
 
-<screen><userinput>export GNOME_PREFIX=/opt/gnome-&gnome-version;</userinput></screen>
+<screen><userinput>export GNOME_PREFIX=/opt/gnome-&gnome-version;&gnome-minor-version;</userinput></screen>
 
   <para>Remember to execute <command>ldconfig</command> as the
   <systemitem class='username'>root</systemitem> user after installation of
@@ -35,16 +35,16 @@
 
   <para>Add to your system or personal profile:</para>
 
-<screen><literal>export PATH=$PATH:/opt/gnome-&gnome-version;/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;/lib/pkgconfig
-export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;/lib</literal></screen>
+<screen><literal>export PATH=$PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/bin
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/pkgconfig
+export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib</literal></screen>
 
   <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
 
 <screen role='root'><userinput>cat >> /etc/ld.so.conf << "EOF"
 <literal># Begin gnome addition to /etc/ld.so.conf
 
-/opt/gnome-&gnome-version;/lib
+/opt/gnome-&gnome-version;&gnome-minor-version;/lib
 
 # End gnome addition</literal>
 EOF</userinput></screen>
@@ -54,7 +54,7 @@
 <screen role='root'><userinput>cat >> /etc/man.conf << "EOF"
 <literal># Begin gnome addition to man.conf
 
-MANPATH /opt/gnome-&gnome-version;/man
+MANPATH /opt/gnome-&gnome-version;&gnome-minor-version;/man
 
 # End gnome addition to man.conf</literal>
 EOF</userinput></screen>

Modified: trunk/BOOK/gnome/core/scrollkeeper.xml
===================================================================
--- trunk/BOOK/gnome/core/scrollkeeper.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/scrollkeeper.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY scrollkeeper-download-http "http://ftp.gnome.org/pub/GNOME/sources/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
-  <!ENTITY scrollkeeper-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
+  <!ENTITY scrollkeeper-download-http "&gnome-download-http;/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
+  <!ENTITY scrollkeeper-download-ftp  "&gnome-download-ftp;/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
   <!ENTITY scrollkeeper-md5sum        "b175e582a6cec3e50a9de73a5bb7455a">
   <!ENTITY scrollkeeper-size          "546 KB">
   <!ENTITY scrollkeeper-buildsize     "12 MB">
@@ -63,8 +63,7 @@
     <bridgehead renderas="sect3">ScrollKeeper Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/>,
-    <xref linkend="libxslt"/> and
+    <para role="required"><xref linkend="libxslt"/> and
     <xref linkend="DocBook"/></para>
 
   </sect2>
@@ -78,7 +77,8 @@
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --disable-static \
     --with-omfdirs=/usr/share/omf:/opt/gnome-1.4/share/omf:\
-/opt/kde-&kde-version;/share/omf:/opt/gnome-&gnome-version;/share/omf &&
+/opt/kde-&kde-version;/share/omf:\
+/opt/gnome-&gnome-version;&gnome-minor-version;/share/omf &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>

Modified: trunk/BOOK/gnome/core/vte.xml
===================================================================
--- trunk/BOOK/gnome/core/vte.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/vte.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY vte-download-http "http://ftp.gnome.org/pub/GNOME/sources/vte/0.11/vte-&vte-version;.tar.bz2">
-  <!ENTITY vte-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/vte/0.11/vte-&vte-version;.tar.bz2">
+  <!ENTITY vte-download-http "&gnome-download-http;/vte/0.11/vte-&vte-version;.tar.bz2">
+  <!ENTITY vte-download-ftp  "&gnome-download-ftp;/vte/0.11/vte-&vte-version;.tar.bz2">
   <!ENTITY vte-md5sum        "a9dc7b330d52ce384e3e5715d396c72f">
   <!ENTITY vte-size          "959 KB">
   <!ENTITY vte-buildsize     "24.7 MB">
@@ -76,7 +76,9 @@
     commands:</para>
 
 <screen><userinput>sed -i 's%\\177:%&kh=\\EOH:@7=\\EOF:%' termcaps/xterm &&
-./configure --prefix=/usr --libexecdir=/usr/sbin --disable-gtk-doc &&
+./configure --prefix=/usr \
+            --libexecdir=/usr/lib/vte \
+            --disable-gtk-doc &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -94,8 +96,8 @@
     <keysym>End</keysym> keys are broken in the <filename>xterm</filename>
     termcap file. This <command>sed</command> command fixes them.</para>
 
-    <para><parameter>--libexecdir=/usr/sbin</parameter>: This switch puts
-    libexec files in <filename class="directory">/usr/sbin</filename>
+    <para><parameter>--libexecdir=/usr/lib/vte</parameter>: This switch puts
+    libexec files in <filename class="directory">/usr/lib/vte</filename>
     instead of <filename class="directory">/usr/libexec</filename>.</para>
 
     <para><parameter>--disable-gtk-doc</parameter>: This switch prevents the
@@ -114,7 +116,7 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gnome-pty-helper and vte</seg>
+        <seg>vte</seg>
         <seg>libvte.[so,a] and vtemodule.[so,a]
         <application>Python</application> module</seg>
         <seg>/usr/include/vte, /usr/lib/vte, /usr/share/gtk-doc/html/vte,
@@ -127,16 +129,6 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="gnome-pty-helper">
-        <term><command>gnome-pty-helper</command></term>
-        <listitem>
-          <para>is a setuid helper for opening ptys.</para>
-          <indexterm zone="vte gnome-pty-helper">
-            <primary sortas="b-gnome-pty-helper">gnome-pty-helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="vte-prog">
         <term><command>vte</command></term>
         <listitem>

Modified: trunk/BOOK/gnome/core/yelp.xml
===================================================================
--- trunk/BOOK/gnome/core/yelp.xml	2006-02-03 06:07:48 UTC (rev 5633)
+++ trunk/BOOK/gnome/core/yelp.xml	2006-02-03 06:09:24 UTC (rev 5634)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY yelp-download-http "http://ftp.gnome.org/pub/GNOME/sources/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
-  <!ENTITY yelp-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
-  <!ENTITY yelp-md5sum        "d6a9c142ca367447f06cee003b6d8a5d">
+  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
+  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
+  <!ENTITY yelp-md5sum        "e229529aa1dacfd269024511e2c12ad2">
   <!ENTITY yelp-size          "815 KB">
-  <!ENTITY yelp-buildsize     "12.5 MB">
+  <!ENTITY yelp-buildsize     "12.2 MB">
   <!ENTITY yelp-time          "0.2 SBU">
 ]>
 
@@ -62,7 +62,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libgnomeui"/>,
-    <xref linkend="gnome-doc-utils"/> and
+    <xref linkend="gnome-doc-utils"/>, and
     a Gecko HTML rendering engine (<xref linkend="mozilla"/> or
     <xref linkend="firefox"/> or
     <xref linkend="thunderbird"/>)</para>
@@ -88,7 +88,7 @@
     commands:</para>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib --sysconfdir=/etc/gnome &&
+    --localstatedir=/var/lib --sysconfdir=&gnome-etc-dir; &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -120,8 +120,8 @@
       <seglistitem>
         <seg>gnome-help and yelp</seg>
         <seg>None</seg>
-        <seg>/etc/gnome/gconf/gconf.xml.defaults/apps/yelp,
-        /etc/gnome/gconf/gconf.xml.defaults/schemas/apps/yelp,
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/apps/yelp,
+        &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/yelp,
         $GNOME_PREFIX/share/icons/hicolor/192x192 and
         $GNOME_PREFIX/share/yelp</seg>
       </seglistitem>




More information about the blfs-book mailing list