[blfs-book] r9430 - in trunk/BOOK: . gnome/core introduction/welcome

[ken]

Author: ken
Date: 2012-02-16 06:04:42 -0700 (Thu, 16 Feb 2012)
New Revision: 9430

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/core/nautilus.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Nautilus-3.2.1

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-02-16 12:30:57 UTC (rev 9429)
+++ trunk/BOOK/general.ent      2012-02-16 13:04:42 UTC (rev 9430)
@@ -733,7 +733,7 @@
 <!ENTITY gnome-terminal-version       "3.2.1">
 <!ENTITY gnome-utils-version          "3.2.1">
 <!ENTITY gucharmap-version            "3.2.2">
-<!ENTITY nautilus-version             "2.30.1">
+<!ENTITY nautilus-version             "3.2.1">
 <!ENTITY yelp-version                 "2.30.1">
 
 <!-- Shell Fallback -->

Modified: trunk/BOOK/gnome/core/nautilus.xml
===================================================================
--- trunk/BOOK/gnome/core/nautilus.xml  2012-02-16 12:30:57 UTC (rev 9429)
+++ trunk/BOOK/gnome/core/nautilus.xml  2012-02-16 13:04:42 UTC (rev 9430)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!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        "e1bda55f9c6cd223561da066dbc4e863">
-  <!ENTITY nautilus-size          "5.9 MB">
-  <!ENTITY nautilus-buildsize     "150 MB">
-  <!ENTITY nautilus-time          "1.3 SBU">
+  <!ENTITY nautilus-download-http 
"&gnome-download-http;/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-download-ftp  
"&gnome-download-ftp;/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-md5sum        "12314328b59aa1dfd83619f718b81bd5">
+  <!ENTITY nautilus-size          "4.5 MB">
+  <!ENTITY nautilus-buildsize     "126 MB">
+  <!ENTITY nautilus-time          "1.1 SBU">
 ]>
 
 <sect1 id="nautilus" xreflabel="Nautilus-&nautilus-version;">
@@ -30,9 +30,9 @@
     <title>Introduction to Nautilus</title>
 
     <para>The <application>Nautilus</application> package contains the
-    <application>GNOME</application> shell and file manager.</para>
+    <application>GNOME</application> file manager.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -65,7 +65,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="docbook-utils"/>,
-    <ulink url="http://libopenraw.freedesktop.org/wiki/Exempi";>Exempi</ulink>,
+     <xref linkend="exempi"/>,
     <xref linkend="libexif"/>, and
     <ulink url="http://valgrind.org/";>Valgrind</ulink></para>
 
@@ -80,22 +80,24 @@
     <para>Install <application>Nautilus</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix 
ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/nautilus &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --libexecdir=$GNOME_PREFIX/lib/nautilus &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>This package needs to be installed before its testsuite can run (or,
+    perhaps, you can run the tests if a previous version is already installed).
+    </para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d $(pkg-config \
-    --variable=prefix ORBit-2.0)/share/doc/nautilus-&nautilus-version; 
&amp;&amp;
-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 $GNOME_PREFIX/share/doc/nautilus-&nautilus-version; 
&amp;&amp;
+install -v -m644 docs/*.{txt,dia,pdf,sxw,faq,html} \
+        
$GNOME_PREFIX/share/doc/nautilus-&nautilus-version;</userinput></screen>
 
+    <para>If you wish to run the testsuite, as a normal unprivileged user 
issue:
+    <command>make check</command>.</para>
+
   </sect2>
 
   <sect2 role="commands">
@@ -104,8 +106,10 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    <para><command>--libexecdir=$GNOME_PREFIX/lib/nautilus</command> : This 
ensures
+    that the <filename class="directory">extensions-3.0/</filename> directory 
is
+    created in a location consistent with the FHS, instead of in
+    <filename class="directory">$GNOME_PREFIX/libexec/</filename>.</para>
 
   </sect2>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2012-02-16 12:30:57 UTC 
(rev 9429)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2012-02-16 13:04:42 UTC 
(rev 9430)
@@ -50,6 +50,9 @@
         <listitem>
           <para>[ken] - add mutter-3.2.1 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge nautilus-3.2.1 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

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