From d1291ad4f60bdaaf4d7a89fa49368d0f74c85582 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Sun, 25 Mar 2012 11:14:09 +0000
Subject: [PATCH] move evolution into gnome section since it is not so
 individual for individual office programs

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9753 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 gnome/add/add.xml                         |  1 +
 {xsoft/office => gnome/add}/evolution.xml | 13 +++----------
 xsoft/office/office.xml                   |  1 -
 3 files changed, 4 insertions(+), 11 deletions(-)
 rename {xsoft/office => gnome/add}/evolution.xml (95%)

diff --git a/gnome/add/add.xml b/gnome/add/add.xml
index 37aead8549..c035877dff 100644
--- a/gnome/add/add.xml
+++ b/gnome/add/add.xml
@@ -47,6 +47,7 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="anjuta.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cheese.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devhelp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany-extensions.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="gedit.xml"/>
diff --git a/xsoft/office/evolution.xml b/gnome/add/evolution.xml
similarity index 95%
rename from xsoft/office/evolution.xml
rename to gnome/add/evolution.xml
index 6cd021fb36..66c9e9dda7 100644
--- a/xsoft/office/evolution.xml
+++ b/gnome/add/evolution.xml
@@ -64,7 +64,6 @@
     <xref linkend="gnome-desktop"/>,
     <xref linkend="gtkhtml"/>,
     <xref linkend="libcanberra"/>,
-    <!--<xref linkend="libgnomecanvas"/>,-->
     <xref linkend="libunique"/>, and
     <xref linkend="shared-mime-info"/></para>
 
@@ -88,20 +87,14 @@
     <ulink url="http://www.freedesktop.org/wiki/Software/GeoClue">GeoClue</ulink>,
     <xref linkend="gstreamer"/>,
     <xref linkend="gtk-doc"/>,
-    <ulink url="http://trac.bjourne.webfactional.com/">gtkimageview</ulink>,
-    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
+    <xref linkend="mitkrb"/>,
     <ulink url="http://projects.gnome.org/libchamplain/">libchamplain</ulink>,
     <xref linkend="libgweather"/>,
     <xref linkend="libnotify"/>,
     <ulink url="http://www.five-ten-sg.com/libpst/">libpst</ulink>,
     <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
-    <ulink url="http://www.gnome.org/projects/NetworkManager/">NetworkManager</ulink>,
-    <xref linkend="openldap"/>, and
-    <ulink url="&gnome-download-http;/gnome-pilot-conduits/2.0/">GNOME
-    Pilot conduits</ulink>
-    (requires <xref linkend="pilot-link"/> then
-    <ulink url="&gnome-download-http;/gnome-pilot/2.0/">GNOME Pilot</ulink>)</para>
+    <xref linkend="NetworkManager"/> and
+    <xref linkend="openldap"/>.</para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/evolution"/></para>
diff --git a/xsoft/office/office.xml b/xsoft/office/office.xml
index 28a63ac9ac..0b77f12977 100644
--- a/xsoft/office/office.xml
+++ b/xsoft/office/office.xml
@@ -23,6 +23,5 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abiword.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnumeric.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnucash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution.xml"/>
 
 </chapter>