From c8397167e4042c793c72dba46ac8a0c6d3432171 Mon Sep 17 00:00:00 2001
From: Wayne Blaszczyk <wblaszcz@linuxfromscratch.org>
Date: Sat, 21 Aug 2010 07:04:34 +0000
Subject: [PATCH] Updated to GNOME Settings Daemon-2.30.2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8542 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                          |  2 +-
 gnome/core/gnome-settings-daemon.xml | 41 ++++++++++++++--------------
 introduction/welcome/changelog.xml   |  3 ++
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/general.ent b/general.ent
index 60885651cd..6370920ec7 100644
--- a/general.ent
+++ b/general.ent
@@ -594,7 +594,7 @@ $Date$
 <!ENTITY gnome-menus-version          "2.30.2">
 <!ENTITY gnome-panel-version          "2.30.2">
 <!ENTITY gnome-session-version        "2.30.2">
-<!ENTITY gnome-settings-daemon-version "2.28.1">
+<!ENTITY gnome-settings-daemon-version "2.30.2">
 <!ENTITY gnome-terminal-version       "2.28.2">
 <!ENTITY gnome-themes-version         "2.28.1">
 <!ENTITY gnome-user-docs-version      "2.28.2">
diff --git a/gnome/core/gnome-settings-daemon.xml b/gnome/core/gnome-settings-daemon.xml
index fed38ea62c..3ce2e0fa9a 100644
--- a/gnome/core/gnome-settings-daemon.xml
+++ b/gnome/core/gnome-settings-daemon.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gnome-settings-daemon-download-http "&gnome-download-http;/gnome-settings-daemon/&gnome-old-version;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.bz2">
-  <!ENTITY gnome-settings-daemon-download-ftp  "&gnome-download-ftp;/gnome-settings-daemon/&gnome-old-version;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.bz2">
-  <!ENTITY gnome-settings-daemon-md5sum        "cadb2e161846c4df76fec45679db1f50">
-  <!ENTITY gnome-settings-daemon-size          "1.1 MB">
-  <!ENTITY gnome-settings-daemon-buildsize     "31 MB">
-  <!ENTITY gnome-settings-daemon-time          "0.5 SBU">
+  <!ENTITY gnome-settings-daemon-download-http "&gnome-download-http;/gnome-settings-daemon/&gnome-version;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.bz2">
+  <!ENTITY gnome-settings-daemon-download-ftp  "&gnome-download-ftp;/gnome-settings-daemon/&gnome-version;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.bz2">
+  <!ENTITY gnome-settings-daemon-md5sum        "b945b1f542167c201a11f0ba1e1a4739">
+  <!ENTITY gnome-settings-daemon-size          "1.2 MB">
+  <!ENTITY gnome-settings-daemon-buildsize     "34 MB">
+  <!ENTITY gnome-settings-daemon-time          "0.6 SBU">
 ]>
 
 <sect1 id="gnome-settings-daemon" xreflabel="GNOME Settings Daemon-&gnome-settings-daemon-version;">
@@ -33,6 +33,8 @@
     for setting various parameters of a <application>GNOME Session</application>
     and the applications that run under it.</para>
 
+    &lfs65_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -80,7 +82,7 @@
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
             --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gnome-settings-daemon &amp;&amp;
+                --variable=prefix ORBit-2.0)/lib/gnome-settings-daemon-2.0 &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -101,11 +103,11 @@ make</userinput></screen>
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-settings-daemon</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gnome-settings-daemon</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+    ORBit-2.0)/lib/gnome-settings-daemon-2.0</parameter>: This parameter causes
+    the libexec files to be installed in the preferred location of <filename
+    class="directory">$GNOME_PREFIX/lib/gnome-settings-daemon-2.0</filename>
+    instead of <filename
+    class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
   </sect2>
 
@@ -113,20 +115,19 @@ make</userinput></screen>
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gnome-settings-daemon</seg>
+        <seg>gnome-settings-daemon and gsd-locate-pointer</seg>
         <seg>liba11y-keyboard.{so,a}, libbackground.{so,a}, libclipboard.{so,a},
-        libdummy.{so,a}, libfont.{so,a}, libhousekeeping.{so,a},
-        libkeybindings.{so,a}, libkeyboard.{so,a}, libmouse.{so,a},
-        libscreensaver.{so,a}, libsound.{so,a}, libtyping-break.{so,a},
-        libxrandr.{so,a}, libxrdb.{so,a}, libxsettings.{so,a} (plugins)</seg>
+        libfont.{so,a}, libhousekeeping.{so,a}, libkeybindings.{so,a},
+        libkeyboard.{so,a}, libmouse.{so,a}, libsound.{so,a},
+        libtyping-break.{so,a}, libxrandr.{so,a}, libxrdb.{so,a}, and
+        libxsettings.{so,a}</seg>
         <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-settings-daemon-2.0/gnome-settings-daemon,
-        lib/{gnome-settings-daemon-2.0,gnome-settings-daemon},
-        share/gnome-settings-daemon/xrdb}</seg>
+        lib/gnome-settings-daemon-2.0,share/gnome-settings-daemon/xrdb}</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 57b369d990..af4fbe613a 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,9 @@
     <listitem>
       <para>August 21st, 2010</para>
       <itemizedlist>
+        <listitem>
+          <para>[wblaszcz] - Updated to GNOME Settings Daemon-2.30.2.</para>
+        </listitem>
         <listitem>
           <para>[wblaszcz] - Updated to GNOME Session-2.30.2.</para>
         </listitem>