Changeset 9f0966e

Timestamp:

07/19/2014 01:43:47 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

gnome

Children:

1324d937

Parents:

d2c17c9e

Message:

Move g-c-c to desktop section, fixes to gnome-contacts.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/gnome@13476 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

gnome

Files:

• applications/applications.xml (modified) (1 diff)
• applications/gnome-contacts.xml (modified) (5 diffs)
• desktop/desktop.xml (modified) (2 diffs)
• desktop/gnome-control-center.xml (moved) (moved from gnome/applications/gnome-control-center.xml )

gnome/applications/applications.xml

@@ -38 +38 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-color-manager.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-control-center.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-dictionary.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-disk-utility.xml"/>

gnome/applications/gnome-contacts.xml

@@ -81 +81 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="evolution-data-server"/>,
       <xref linkend="folks"/> (built with e-d-s support),
       <xref linkend="gnome-desktop"/>,
-      <xref linkend="libgee"/>,
       <xref linkend="libnotify"/>,
       <xref linkend="gnome-online-accounts"/>, and
@@ -91 +91 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="cheese"/>, and
-      <xref linkend="gstreamer10"/>
+      <xref linkend="cheese"/>
     </para>
 
@@ -113 +112 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-                               --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -129 +127 @@
   </sect2>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-cheese</option>: Use this switch if you 
-      wish to enable cheese webcam support.
-    </para>
-
-
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
@@ -159 +143 @@
         </seg>
         <seg>
-          /usr/lib/gnome-contacts
+          None
         </seg>
       </seglistitem>

gnome/desktop/desktop.xml

@@ -17 +17 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="caribou.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-backgrounds.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-icon-theme-extras.xml"/>
@@ -25 +24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yelp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-bluetooth.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-settings-daemon.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-control-center.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mutter.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus.xml"/>