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

ken at linuxfromscratch.org ken at linuxfromscratch.org
Fri Feb 10 13:16:38 PST 2012


Author: ken
Date: 2012-02-10 14:16:34 -0700 (Fri, 10 Feb 2012)
New Revision: 9356

Added:
   trunk/BOOK/gnome/core/epiphany.xml
Removed:
   trunk/BOOK/gnome/add/epiphany.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/add/add.xml
   trunk/BOOK/gnome/core/core.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Epiphany-3.2.1

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-02-10 20:24:23 UTC (rev 9355)
+++ trunk/BOOK/general.ent	2012-02-10 21:16:34 UTC (rev 9356)
@@ -707,6 +707,7 @@
 <!ENTITY brasero-version              "3.2.0">
 <!ENTITY empathy-version              "3.2.2">
 <!ENTITY eog-version                  "3.2.2">
+<!ENTITY epiphany-version             "3.2.1">
 <!ENTITY gnome-terminal-version       "2.30.2">
 <!ENTITY nautilus-version             "2.30.1">
 <!ENTITY yelp-version                 "2.30.1">
@@ -742,7 +743,6 @@
 <!ENTITY cheese-version               "2.30.1">
 <!ENTITY deskbar-applet-version       "2.30.1">
 <!ENTITY ekiga-version                "3.2.7">
-<!ENTITY epiphany-version             "2.30.2">
 <!ENTITY evince-version               "2.30.2">
 <!ENTITY file-roller-version          "2.30.2">
 <!ENTITY gcalctool-version            "5.30.2">

Modified: trunk/BOOK/gnome/add/add.xml
===================================================================
--- trunk/BOOK/gnome/add/add.xml	2012-02-10 20:24:23 UTC (rev 9355)
+++ trunk/BOOK/gnome/add/add.xml	2012-02-10 21:16:34 UTC (rev 9356)
@@ -41,7 +41,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cheese.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="deskbar-applet.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcalctool.xml"/>

Deleted: trunk/BOOK/gnome/add/epiphany.xml
===================================================================
--- trunk/BOOK/gnome/add/epiphany.xml	2012-02-10 20:24:23 UTC (rev 9355)
+++ trunk/BOOK/gnome/add/epiphany.xml	2012-02-10 21:16:34 UTC (rev 9356)
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
-  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
-  <!ENTITY epiphany-md5sum        "29b084acfa016540d91d3601ec3dff5c">
-  <!ENTITY epiphany-size          "5.6 MB">
-  <!ENTITY epiphany-buildsize     "83 MB">
-  <!ENTITY epiphany-time          "1.0 SBU">
-]>
-
-<sect1 id="epiphany" xreflabel="Epiphany-&epiphany-version;">
-  <?dbhtml filename="epiphany.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Epiphany-&epiphany-version;</title>
-
-  <indexterm zone="epiphany">
-    <primary sortas="a-Epiphany">Epiphany</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Epiphany</title>
-
-    <para><application>Epiphany</application> is a simple yet powerful
-    <application>GNOME</application> web browser targeted at non-technical
-    users. Its principles are simplicity and standards compliance.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&epiphany-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&epiphany-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &epiphany-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &epiphany-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &epiphany-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &epiphany-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Epiphany Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="iso-codes"/>,
-    <xref linkend="libgnome-keyring"/>,
-    <xref linkend="nss"/>,
-    <xref linkend="startup-notification"/>, and
-    <xref linkend="webkitgtk"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="rarian"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="avahi"/>,
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="libnotify"/>,
-    <ulink
-    url="http://www.gnome.org/projects/NetworkManager/">NetworkManager</ulink>,
-    and <ulink url="http://live.gnome.org/Seed">Seed</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/epiphany"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Epiphany</title>
-
-    <para>Install <application>Epiphany</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --mandir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/share/man \
-            --with-ca-file=/etc/ssl/ca-bundle.crt &&
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>A <application>D-BUS</application> service script was installed in
-    the previous step. If the <envar>$GNOME_PREFIX</envar> is anything other
-    than <filename class='directory'>/usr</filename>, as the
-    <systemitem class="username">root</systemitem> user you should add the
-    <filename class='directory'>$GNOME_PREFIX/share/dbus-1/services</filename>
-    directory to the local session configuration as described in the
-    <xref linkend="dbus"/> configuration section.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
-
-    <para><option>--disable-scrollkeeper</option>: Use this option if you
-    wish to disable the updates to the scrollkeeper database.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>epiphany</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/epiphany/2.30/epiphany,
-        share/{epiphany/{art,glade,icons/hicolor/{16x16/{actions,places,status},
-        22x22/{actions,places,status},24x24/{actions,places,status},
-        32x32/{actions,status},48x48/status,scalable/{actions,status}}},
-        gnome/help/epiphany/*,gtk-doc/html/epiphany,
-        icons/LowContrastLargePrint/48x48/apps,omf/epiphany}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="epiphany-prog">
-        <term><command>epiphany</command></term>
-        <listitem>
-          <para>is a <application>GNOME</application> web browser based on
-          the <application>WebKit</application> rendering engine.</para>
-          <indexterm zone="epiphany epiphany-prog">
-            <primary sortas="b-epiphany">epiphany</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/gnome/core/core.xml
===================================================================
--- trunk/BOOK/gnome/core/core.xml	2012-02-10 20:24:23 UTC (rev 9355)
+++ trunk/BOOK/gnome/core/core.xml	2012-02-10 21:16:34 UTC (rev 9356)
@@ -96,8 +96,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brasero.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="empathy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eog.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcalctool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-contacts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-disk-utility.xml"/>

Copied: trunk/BOOK/gnome/core/epiphany.xml (from rev 9351, trunk/BOOK/gnome/add/epiphany.xml)
===================================================================
--- trunk/BOOK/gnome/core/epiphany.xml	                        (rev 0)
+++ trunk/BOOK/gnome/core/epiphany.xml	2012-02-10 21:16:34 UTC (rev 9356)
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-md5sum        "b07a47656a07f695c70eb56b628f9df7">
+  <!ENTITY epiphany-size          "4.9 MB">
+  <!ENTITY epiphany-buildsize     "92 MB">
+  <!ENTITY epiphany-time          "1.0 SBU">
+]>
+
+<sect1 id="epiphany" xreflabel="Epiphany-&epiphany-version;">
+  <?dbhtml filename="epiphany.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Epiphany-&epiphany-version;</title>
+
+  <indexterm zone="epiphany">
+    <primary sortas="a-Epiphany">Epiphany</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Epiphany</title>
+
+    <para><application>Epiphany</application> is a simple yet powerful
+    <application>GNOME</application> web browser targeted at non-technical
+    users. Its principles are simplicity and standards compliance.</para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&epiphany-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&epiphany-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &epiphany-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &epiphany-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &epiphany-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &epiphany-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Epiphany Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="GConf"/>,
+    <xref linkend="gnome-doc-utils"/>,
+    <xref linkend="iso-codes"/>,
+    <xref linkend="libgnome-keyring"/>,
+    <xref linkend="nss"/>,
+    <xref linkend="startup-notification"/>, and
+    <xref linkend="webkitgtk"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="cacerts"/> and
+    <xref linkend="rarian"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="avahi"/>,
+    <xref linkend="gtk-doc"/>,
+    <xref linkend="libnotify"/>,
+    <xref linkend="NetworkManager"/>,
+    <!-- FIXME:ken
+    and <xref linkend="seed"/></para>-->
+    and seed-3.2.0</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/epiphany"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Epiphany</title>
+
+    <para>Install <application>Epiphany</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --with-ca-file=/etc/ssl/ca-bundle.crt &&
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>A <application>D-BUS</application> service script was installed in
+    the previous step. If the <envar>$GNOME_PREFIX</envar> is anything other
+    than <filename class='directory'>/usr</filename>, as the
+    <systemitem class="username">root</systemitem> user you should add the
+    <filename class='directory'>$GNOME_PREFIX/share/dbus-1/services</filename>
+    directory to the local session configuration as described in the
+    <xref linkend="dbus"/> configuration section.</para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <para><parameter>--with-ca-file=/etc/ssl/ca-bundle.crt</parameter>:
+    Omit this if you have not installed the certificates.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>epiphany</seg>
+        <seg>None</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/epiphany/,
+        share/{epiphany/{art,glade,icons/hicolor/{16x16/{actions,places,status},
+        22x22/{actions,places,status},24x24/{actions,places,status},
+        32x32/{actions,status},48x48/status,scalable/{actions,status}}},
+        gnome/help/epiphany/*,gtk-doc/html/epiphany,
+        icons/LowContrastLargePrint/48x48/apps,omf/epiphany}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="epiphany-prog">
+        <term><command>epiphany</command></term>
+        <listitem>
+          <para>is a <application>GNOME</application> web browser based on
+          the <application>WebKit</application> rendering engine.</para>
+          <indexterm zone="epiphany epiphany-prog">
+            <primary sortas="b-epiphany">epiphany</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-02-10 20:24:23 UTC (rev 9355)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-02-10 21:16:34 UTC (rev 9356)
@@ -80,6 +80,9 @@
         <listitem>
           <para>[ken] - merge eog-3.2.2 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge epiphany-3.2.1 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 




More information about the blfs-book mailing list