Author: ken Date: 2012-02-10 12:59:56 -0700 (Fri, 10 Feb 2012) New Revision: 9353
Added: trunk/BOOK/gnome/core/empathy.xml Removed: trunk/BOOK/gnome/add/empathy.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: Empathy-3.2.2. Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2012-02-10 19:36:47 UTC (rev 9352) +++ trunk/BOOK/general.ent 2012-02-10 19:59:56 UTC (rev 9353) @@ -705,6 +705,7 @@ <!-- Utilities --> <!ENTITY brasero-version "3.2.0"> +<!ENTITY empathy-version "3.2.2"> <!ENTITY gnome-terminal-version "2.30.2"> <!ENTITY nautilus-version "2.30.1"> <!ENTITY yelp-version "2.30.1"> @@ -740,7 +741,6 @@ <!ENTITY cheese-version "2.30.1"> <!ENTITY deskbar-applet-version "2.30.1"> <!ENTITY ekiga-version "3.2.7"> -<!ENTITY empathy-version "2.30.2"> <!ENTITY eog-version "2.30.2"> <!ENTITY epiphany-version "2.30.2"> <!ENTITY evince-version "2.30.2"> Modified: trunk/BOOK/gnome/add/add.xml =================================================================== --- trunk/BOOK/gnome/add/add.xml 2012-02-10 19:36:47 UTC (rev 9352) +++ trunk/BOOK/gnome/add/add.xml 2012-02-10 19:59:56 UTC (rev 9353) @@ -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="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"/> Deleted: trunk/BOOK/gnome/add/empathy.xml =================================================================== --- trunk/BOOK/gnome/add/empathy.xml 2012-02-10 19:36:47 UTC (rev 9352) +++ trunk/BOOK/gnome/add/empathy.xml 2012-02-10 19:59:56 UTC (rev 9353) @@ -1,217 +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 empathy-download-http "&gnome-download-http;/empathy/&gnome-version;/empathy-&empathy-version;.tar.bz2"> - <!ENTITY empathy-download-ftp "&gnome-download-ftp;/empathy/&gnome-version;/empathy-&empathy-version;.tar.bz2"> - <!ENTITY empathy-md5sum "964b48ccc63a2acdd14224eb763d6bf6"> - <!ENTITY empathy-size "2.5 MB"> - <!ENTITY empathy-buildsize "97 MB"> - <!ENTITY empathy-time "1.5 SBU"> -]> - -<sect1 id="empathy" xreflabel="Empathy-&empathy-version;"> - <?dbhtml filename="empathy.html"?> - - <sect1info> - <othername>$LastChangedBy$</othername> - <date>$Date$</date> - </sect1info> - - <title>Empathy-&empathy-version;</title> - - <indexterm zone="empathy"> - <primary sortas="a-empathy">Empathy</primary> - </indexterm> - - <sect2 role="package"> - <title>Introduction to Empathy</title> - - <para>The <application>Empathy</application> package is a messaging program - which supports text, voice, and video chat and file transfers over many - different protocols.</para> - - &lfs65_built; - - <bridgehead renderas="sect3">Package Information</bridgehead> - <itemizedlist spacing="compact"> - <listitem> - <para>Download (HTTP): <ulink url="&empathy-download-http;"/></para> - </listitem> - <listitem> - <para>Download (FTP): <ulink url="&empathy-download-ftp;"/></para> - </listitem> - <listitem> - <para>Download MD5 sum: &empathy-md5sum;</para> - </listitem> - <listitem> - <para>Download size: &empathy-size;</para> - </listitem> - <listitem> - <para>Estimated disk space required: &empathy-buildsize;</para> - </listitem> - <listitem> - <para>Estimated build time: &empathy-time;</para> - </listitem> - </itemizedlist> - - <bridgehead renderas="sect3">Empathy Dependencies</bridgehead> - - <bridgehead renderas="sect4">Required</bridgehead> - <para role="required"><xref linkend="evolution-data-server"/>, - <xref linkend="gnome-doc-utils"/>, - <xref linkend="libcanberra"/>, - <xref linkend="libgnome-keyring"/>, - <xref linkend="libnotify"/>, - <xref linkend="libunique"/>, - <xref linkend="telepathy-farsight"/>, and - <xref linkend="which"/></para> - - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"><ulink url="http://check.sourceforge.net/";>Check</ulink>, - <xref linkend="clutter-gtk"/>, - <ulink url="http://connman.net/";>ConnMan</ulink>, - <xref linkend="enchant"/>, - <ulink url="http://www.freedesktop.org/wiki/Software/GeoClue";>GeoClue</ulink>, - <xref linkend="gnome-panel"/>, - <xref linkend="gtk-doc"/>, - <xref linkend="iso-codes"/>, - <ulink url="http://projects.gnome.org/libchamplain/";>libchamplain</ulink>, - <ulink url="http://www.gnome.org/projects/NetworkManager/";>NetworkManager</ulink>, - <xref linkend="pygtk"/>, - <xref linkend="rarian"/>, - <ulink url="http://www.valgrind.org/";>Valgrind</ulink>, and - <xref linkend="webkitgtk"/></para> - - <bridgehead renderas="sect4">Optional (Protocols)</bridgehead> - <para role="optional"> <ulink - url="http://telepathy.freedesktop.org/releases/telepathy-butterfly/";>telepathy-butterfly</ulink> - (MSN), <ulink - url="http://telepathy.freedesktop.org/releases/telepathy-gabble/";>telepathy-gabble</ulink> - (Jabber, Google Talk, XMPP), <ulink - url="http://telepathy.freedesktop.org/releases/telepathy-idle/";>telepathy-idle</ulink> - (IRC), <ulink - url="http://telepathy.freedesktop.org/releases/telepathy-haze/";>telepathy-haze</ulink> - (AIM, ICQ, Yahoo!), <ulink - url="http://telepathy.freedesktop.org/releases/telepathy-salut/";>telepathy-salut</ulink> - (local network ("Bonjour" - iChat-compatible)), and <ulink - url="http://telepathy.freedesktop.org/releases/telepathy-sofiasip/";>telepathy-sofiasip</ulink> - (SIP)</para> - - <para condition="html" role="usernotes">User Notes: - <ulink url="&blfs-wiki;/empathy"/></para> - - </sect2> - - <sect2 role="installation"> - <title>Installation of Empathy</title> - - <para>Install <application>Empathy</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/empathy && -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> - - </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"/> - - <para><parameter>--libexecdir=$(pkg-config --variable=prefix - ORBit-2.0)/lib/empathy</parameter>: This parameter is used so that the - <application>Empathy</application> internal support programs are installed - in the preferred location of <filename - class='directory'>$GNOME_PREFIX/lib/empathy</filename> instead of <filename - class='directory'>$GNOME_PREFIX/libexec</filename>.</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 Programs</segtitle> - <segtitle>Installed Libraries</segtitle> - <segtitle>Installed Directories</segtitle> - - <seglistitem> - <seg>empathy, empathy-accounts, and empathy-debugger</seg> - <seg>libnstempathy.{so,a}</seg> - <seg><envar>$GNOME_PREFIX</envar>/share/{empathy/icons/hicolor/{16x16/{actions, - apps,status},22x22/{actions,apps,status},24x24/{actions,apps,status}, - 32x32/{apps,status},48x48/{apps,status},scalable/{apps,status}}, - gnome/help/empathy/*,telepathy/clients}</seg> - </seglistitem> - </segmentedlist> - - <variablelist> - <bridgehead renderas="sect3">Short Descriptions</bridgehead> - <?dbfo list-presentation="list"?> - <?dbhtml list-presentation="table"?> - - <varlistentry id="empathy-prog"> - <term><command>empathy</command></term> - <listitem> - <para>is a <application>GNOME</application> instant messaging client - using Telepathy.</para> - <indexterm zone="empathy empathy-prog"> - <primary sortas="b-empathy">empathy</primary> - </indexterm> - </listitem> - </varlistentry> - - <!--<varlistentry id="empathy-accounts"> - <term><command>empathy-accounts</command></term> - <listitem> - <para>.</para> - <indexterm zone="empathy empathy-accounts"> - <primary sortas="b-empathy-accounts">empathy-accounts</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="empathy-debugger"> - <term><command>empathy-debugger</command></term> - <listitem> - <para>.</para> - <indexterm zone="empathy empathy-debugger"> - <primary sortas="b-empathy-debugger">empathy-debugger</primary> - </indexterm> - </listitem> - </varlistentry>--> - - <varlistentry id="libnstempathy"> - <term><filename class='libraryfile'>libnstempathy.{so,a}</filename></term> - <listitem> - <para>is the <application>Empathy</application> nautilus-sendto plugin.</para> - <indexterm zone="empathy libnstempathy"> - <primary sortas="c-libnstempathy">libnstempathy.{so,a}</primary> - </indexterm> - </listitem> - </varlistentry> - - </variablelist> - - </sect2> - -</sect1> Modified: trunk/BOOK/gnome/core/core.xml =================================================================== --- trunk/BOOK/gnome/core/core.xml 2012-02-10 19:36:47 UTC (rev 9352) +++ trunk/BOOK/gnome/core/core.xml 2012-02-10 19:59:56 UTC (rev 9353) @@ -94,8 +94,8 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dummy-utilities.xml"/> <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="epiphany.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="epiphany.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="evince.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gcalctool.xml"/> Copied: trunk/BOOK/gnome/core/empathy.xml (from rev 9351, trunk/BOOK/gnome/add/empathy.xml) =================================================================== --- trunk/BOOK/gnome/core/empathy.xml (rev 0) +++ trunk/BOOK/gnome/core/empathy.xml 2012-02-10 19:59:56 UTC (rev 9353) @@ -0,0 +1,215 @@ +<?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 empathy-download-http "&gnome-download-http;/empathy/&gnome-version;/empathy-&empathy-version;.tar.xz"> + <!ENTITY empathy-download-ftp "&gnome-download-ftp;/empathy/&gnome-version;/empathy-&empathy-version;.tar.xz"> + <!ENTITY empathy-md5sum "1e55c9052cbee9cb065e23cb358a6720"> + <!ENTITY empathy-size "?? MB"> + <!ENTITY empathy-buildsize "?? MB"> + <!ENTITY empathy-time "?? SBU"> +]> + +<sect1 id="empathy" xreflabel="Empathy-&empathy-version;"> + <?dbhtml filename="empathy.html"?> + + <sect1info> + <othername>$LastChangedBy$</othername> + <date>$Date$</date> + </sect1info> + + <title>Empathy-&empathy-version;</title> + + <indexterm zone="empathy"> + <primary sortas="a-empathy">Empathy</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to Empathy</title> + + <para>The <application>Empathy</application> package is a messaging program + which supports text, voice, and video chat and file transfers over many + different protocols.</para> + + <!-- &lfs65_built; not for this version! --> + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para>Download (HTTP): <ulink url="&empathy-download-http;"/></para> + </listitem> + <listitem> + <para>Download (FTP): <ulink url="&empathy-download-ftp;"/></para> + </listitem> + <listitem> + <para>Download MD5 sum: &empathy-md5sum;</para> + </listitem> + <listitem> + <para>Download size: &empathy-size;</para> + </listitem> + <listitem> + <para>Estimated disk space required: &empathy-buildsize;</para> + </listitem> + <listitem> + <para>Estimated build time: &empathy-time;</para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">Empathy Dependencies</bridgehead> + + <bridgehead renderas="sect4">Required</bridgehead> + <para role="required"><xref linkend="evolution-data-server"/>, + <xref linkend="gnome-doc-utils"/>, + <xref linkend="libcanberra"/>, + <xref linkend="libgnome-keyring"/>, + <xref linkend="libnotify"/>, + <xref linkend="libunique"/>, + <xref linkend="telepathy-farsight"/>, and + <xref linkend="which"/></para> + + <bridgehead renderas="sect4">Optional</bridgehead> + <para role="optional"><ulink url="http://check.sourceforge.net/";>Check</ulink>, + <xref linkend="clutter-gtk"/>, + <ulink url="http://connman.net/";>ConnMan</ulink>, + <xref linkend="enchant"/>, + <ulink url="http://www.freedesktop.org/wiki/Software/GeoClue";>GeoClue</ulink>, + <xref linkend="gnome-panel"/>, + <xref linkend="gtk-doc"/>, + <xref linkend="iso-codes"/>, + <ulink url="http://projects.gnome.org/libchamplain/";>libchamplain</ulink>, + <xref linkend="NetworkManager"/>, + <xref linkend="pygtk"/>, + <xref linkend="rarian"/>, + <ulink url="http://www.valgrind.org/";>Valgrind</ulink>, and + <xref linkend="webkitgtk"/></para> + + <bridgehead renderas="sect4">Optional (Protocols)</bridgehead> + <para role="optional"> <ulink + url="http://telepathy.freedesktop.org/releases/telepathy-butterfly/";>telepathy-butterfly</ulink> + (MSN), <ulink + url="http://telepathy.freedesktop.org/releases/telepathy-gabble/";>telepathy-gabble</ulink> + (Jabber, Google Talk, XMPP), <ulink + url="http://telepathy.freedesktop.org/releases/telepathy-idle/";>telepathy-idle</ulink> + (IRC), <ulink + url="http://telepathy.freedesktop.org/releases/telepathy-haze/";>telepathy-haze</ulink> + (AIM, ICQ, Yahoo!), <ulink + url="http://telepathy.freedesktop.org/releases/telepathy-salut/";>telepathy-salut</ulink> + (local network ("Bonjour" - iChat-compatible)), and <ulink + url="http://telepathy.freedesktop.org/releases/telepathy-sofiasip/";>telepathy-sofiasip</ulink> + (SIP)</para> + + <para condition="html" role="usernotes">User Notes: + <ulink url="&blfs-wiki;/empathy"/></para> + + </sect2> + + <sect2 role="installation"> + <title>Installation of Empathy</title> + + <para>Install <application>Empathy</application> by running the following + commands:</para> + +<screen><userinput>./configure --prefix=$GNOME_PREFIX \ + --sysconfdir=$GNOME_SYSCONFDIR \ + --libexecdir=$GNOME_PREFIX/lib/empathy && +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> + + </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"/> + + <para><parameter>--libexecdir=$GNOME_PREFIX/lib/empathy</parameter>: This + parameter is used so that the <application>Empathy</application> internal + support programs are installed in the preferred location of <filename + class='directory'>$GNOME_PREFIX/lib/empathy</filename> instead of <filename + class='directory'>$GNOME_PREFIX/libexec</filename>.</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 Programs</segtitle> + <segtitle>Installed Libraries</segtitle> + <segtitle>Installed Directories</segtitle> + + <seglistitem> + <seg>empathy, empathy-accounts, and empathy-debugger</seg> + <seg>libnstempathy.{so,a}</seg> + <seg><envar>$GNOME_PREFIX</envar>/share/{empathy/icons/hicolor/{16x16/{actions, + apps,status},22x22/{actions,apps,status},24x24/{actions,apps,status}, + 32x32/{apps,status},48x48/{apps,status},scalable/{apps,status}}, + gnome/help/empathy/*,telepathy/clients}</seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="empathy-prog"> + <term><command>empathy</command></term> + <listitem> + <para>is a <application>GNOME</application> instant messaging client + using Telepathy.</para> + <indexterm zone="empathy empathy-prog"> + <primary sortas="b-empathy">empathy</primary> + </indexterm> + </listitem> + </varlistentry> + + <!--<varlistentry id="empathy-accounts"> + <term><command>empathy-accounts</command></term> + <listitem> + <para>.</para> + <indexterm zone="empathy empathy-accounts"> + <primary sortas="b-empathy-accounts">empathy-accounts</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="empathy-debugger"> + <term><command>empathy-debugger</command></term> + <listitem> + <para>.</para> + <indexterm zone="empathy empathy-debugger"> + <primary sortas="b-empathy-debugger">empathy-debugger</primary> + </indexterm> + </listitem> + </varlistentry>--> + + <varlistentry id="libnstempathy"> + <term><filename class='libraryfile'>libnstempathy.{so,a}</filename></term> + <listitem> + <para>is the <application>Empathy</application> nautilus-sendto plugin.</para> + <indexterm zone="empathy libnstempathy"> + <primary sortas="c-libnstempathy">libnstempathy.{so,a}</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2012-02-10 19:36:47 UTC (rev 9352) +++ trunk/BOOK/introduction/welcome/changelog.xml 2012-02-10 19:59:56 UTC (rev 9353) @@ -69,6 +69,9 @@ <listitem> <para>[ken] - add dconf-0.10.0 from Wayne.</para> </listitem> + <listitem> + <para>[ken] - merge empathy-3.2.2 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
